aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2008-05-20net_sched: cls_api: fix return value for non-existant classifiersPatrick McHardy1-1/+1
cls_api should return ENOENT when the requested classifier doesn't exist. Signed-off-by: Patrick McHardy <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2008-05-20ipsec: Use the correct ip_local_out functionHerbert Xu2-2/+2
Because the IPsec output function xfrm_output_resume does its own dst_output call it should always call __ip_local_output instead of ip_local_output as the latter may invoke dst_output directly. Otherwise the return values from nf_hook and dst_output may clash as they both use the value 1 but for different purposes. When that clash occurs this can cause a packet to be used after it has been freed which usually leads to a crash. Because the offending value is only returned from dst_output with qdiscs such as HTB, this bug is normally not visible. Thanks to Marco Berizzi for his perseverance in tracking this down. Signed-off-by: Herbert Xu <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2008-05-20Merge branch 'fixes' of ↵Linus Torvalds2-6/+6
git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: iop-adma: fixup some kzalloc/memset confusions fsldma: update the fsldma driver MAINTAINERS info
2008-05-20USB: CDC WDM driverOliver Neukum4-0/+761
Signed-off-by: Oliver Neukum <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2008-05-20USB: ehci-orion: the Orion EHCI root hub does have a Transaction TranslatorLennert Buytenhek1-0/+2
Commit 7329e211b987a493cbcfca0e98c60eb108ab42df ("USB: root hubs don't lie about their number of TTs") requires the various platform EHCI glue modules to set ->has_tt if the root hub has a Transaction Translator. The Orion EHCI root hub does have a Transaction Translator, so set ->has_tt in ehci_orion_setup(). This fixes oopsing on plugging in a low speed device. Signed-off-by: Lennert Buytenhek <[email protected]> Acked-by: Nicolas Pitre <[email protected]> Acked-by: David Brownell <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2008-05-20USB: serial: ch341: New VID/PID for CH341 USB-serialMichael F. Robbins1-0/+1
Recent USB-serial devices using the WinChipHead CH340/CH341 chipset are being shipped with a new vendor/product ID code pair, but an otherwise identical device. (This is confirmed by looking at INF for the included Windows driver.) Patch is tested and working, both with new and old devices. Signed-off-by: Michael F. Robbins <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2008-05-20USB: build fixIngo Molnar1-1/+1
this config: http://redhat.com/~mingo/misc/config-Wed_Apr_30_15_12_48_CEST_2008.bad fails to build due to an #error. Turn that into a #warning instead to not break randconfig builds unnecessarily. Signed-off-by: Ingo Molnar <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2008-05-20USB: pxa27x_udc - Fix Oopskarl beldan1-1/+2
udc_disable oopses dereferencing udc_command. Signed-off-by: Karl Beldan <[email protected]> Acked-by: Robert Jarzmik <[email protected]> Acked-by: David Brownell <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2008-05-20USB: OPTION: fix name of Onda MSA501HS HSDPA modemArnaldo Carvalho de Melo1-1/+2
This fixes the name of the onda MSA501HS device, I guess it is called different things in different countries. Signed-off-by: Arnaldo Carvalho de Melo <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2008-05-20USB: add TELIT HDSPA UC864-E modem to option driverGreg Kroah-Hartman1-0/+4
This adds the Telit UC864-E HDSPA modem support to the option driver. This lets their customers comply with the GPL instead of having to use a binary driver from the manufacturer. Cc: Simon Kissel <[email protected]> Cc: Nico Erfurth <[email protected]> Cc: Andrea Ghezzo <[email protected]> Cc: Dietmar Staps <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2008-05-20usb-serial: Use ftdi_sio driver for RATOC REX-USB60FAtsushi Nemoto4-2/+7
This patch reverts 57833ea6b95a3995149f1f6d1a8d8862ab7a0ba2 ("usb-serial: pl2303: add support for RATOC REX-USB60F") and adds support for the device to ftdi_sio driver. Cc: Akira Tsukamoto <[email protected]> Cc: stable <[email protected]> Signed-off-by: Atsushi Nemoto <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2008-05-20MAINTAINERS: Add cxgb3 and iw_cxgb3 NIC and iWARP driver entriesSteve Wise1-0/+14
Signed-off-by: Steve Wise <[email protected]> Signed-off-by: Roland Dreier <[email protected]>
2008-05-20IB/mlx4: Fix creation of kernel QP with max number of send s/g entriesRoland Dreier1-5/+8
When creating a kernel QP where the consumer asked for a send queue with lots of scatter/gater entries, set_kernel_sq_size() incorrectly returned an error if the send queue stride is larger than the hardware's maximum send work request descriptor size. This is not a problem; the only issue is to make sure that the actual descriptors used do not overflow the maximum descriptor size, so check this instead. Clamp the returned max_send_sge value to be no bigger than what query_device returns for the max_sge to avoid confusing hapless users, even if the hardware is capable of handling a few more s/g entries. This bug caused NFS/RDMA mounts to fail when the server adapter used the mlx4 driver. Signed-off-by: Roland Dreier <[email protected]>
2008-05-20iop-adma: fixup some kzalloc/memset confusionsChristophe Jaillet1-4/+2
1) Remove an explicit memset(.., 0, ...) to a variable allocated with kzalloc (i.e. 'dest'). 2) Allocate 'src' with kmalloc instead of kzalloc as all elements of the 'src' buffer are initialized in a 'for(...)' loop just after. 3) remove useless 'sizeof(u8)', which always returns 1, when computing the size of the memory to be allocated. Signed-off-by: Christophe Jaillet <[email protected]> Signed-off-by: Dan Williams <[email protected]>
2008-05-20fsldma: update the fsldma driver MAINTAINERS infoZhang Wei1-2/+4
Add Li Yang as the new maintainer for fsldma driver and update my email address. Acked-by: Li Yang <[email protected]> Signed-off-by: Zhang Wei <[email protected]> Signed-off-by: Dan Williams <[email protected]>
2008-05-20SCSI: fix race in device_createGreg Kroah-Hartman4-16/+17
There is a race from when a device is created with device_create() and then the drvdata is set with a call to dev_set_drvdata() in which a sysfs file could be open, yet the drvdata will be NULL, causing all sorts of bad things to happen. This patch fixes the problem by using the new function, device_create_drvdata(). It fixes the problem in all of the scsi drivers that need it. Cc: Kay Sievers <[email protected]> Cc: Doug Gilbert <[email protected]> Cc: James E.J. Bottomley <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2008-05-20USB: Core: fix race in device_createGreg Kroah-Hartman1-3/+3
There is a race from when a device is created with device_create() and then the drvdata is set with a call to dev_set_drvdata() in which a sysfs file could be open, yet the drvdata will be NULL, causing all sorts of bad things to happen. This patch fixes the problem by using the new function, device_create_drvdata(). Cc: Kay Sievers <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2008-05-20USB: Phidget: fix race in device_createGreg Kroah-Hartman3-10/+9
There is a race from when a device is created with device_create() and then the drvdata is set with a call to dev_set_drvdata() in which a sysfs file could be open, yet the drvdata will be NULL, causing all sorts of bad things to happen. This patch fixes the problem by using the new function, device_create_drvdata(). It fixes all 3 phidget drivers, which all have the same problem. Cc: Kay Sievers <[email protected]> Cc: Sean Young <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2008-05-20s390: fix race in device_createGreg Kroah-Hartman1-5/+4
There is a race from when a device is created with device_create() and then the drvdata is set with a call to dev_set_drvdata() in which a sysfs file could be open, yet the drvdata will be NULL, causing all sorts of bad things to happen. This patch fixes the problem by using the new function, device_create_drvdata(). Cc: Kay Sievers <[email protected]> Cc: Martin Schwidefsky <[email protected]> Cc: Heiko Carstens <[email protected]> Cc: Cornelia Huck <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2008-05-20SOUND: fix race in device_createGreg Kroah-Hartman1-5/+3
There is a race from when a device is created with device_create() and then the drvdata is set with a call to dev_set_drvdata() in which a sysfs file could be open, yet the drvdata will be NULL, causing all sorts of bad things to happen. This patch fixes the problem by using the new function, device_create_drvdata(). Cc: Kay Sievers <[email protected]> Cc: Jaroslav Kysela <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2008-05-20UIO: fix race in device_createGreg Kroah-Hartman1-4/+3
There is a race from when a device is created with device_create() and then the drvdata is set with a call to dev_set_drvdata() in which a sysfs file could be open, yet the drvdata will be NULL, causing all sorts of bad things to happen. This patch fixes the problem by using the new function, device_create_drvdata(). Cc: Kay Sievers <[email protected]> Cc: Hans J. Koch <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2008-05-20Power Supply: fix race in device_createGreg Kroah-Hartman1-4/+2
There is a race from when a device is created with device_create() and then the drvdata is set with a call to dev_set_drvdata() in which a sysfs file could be open, yet the drvdata will be NULL, causing all sorts of bad things to happen. This patch fixes the problem by using the new function, device_create_drvdata(). Cc: Kay Sievers <[email protected]> Cc: Anton Vorontsov <[email protected]> Cc: David Woodhouse <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2008-05-20LEDS: fix race in device_createGreg Kroah-Hartman1-4/+2
There is a race from when a device is created with device_create() and then the drvdata is set with a call to dev_set_drvdata() in which a sysfs file could be open, yet the drvdata will be NULL, causing all sorts of bad things to happen. This patch fixes the problem by using the new function, device_create_drvdata(). Cc: Kay Sievers <[email protected]> Cc: Richard Purdie <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2008-05-20IB: fix race in device_createGreg Kroah-Hartman2-13/+12
There is a race from when a device is created with device_create() and then the drvdata is set with a call to dev_set_drvdata() in which a sysfs file could be open, yet the drvdata will be NULL, causing all sorts of bad things to happen. This patch fixes the problem by using the new function, device_create_drvdata(). Cc: Kay Sievers <[email protected]> Reviewed-by: Roland Dreier <[email protected]> Cc: Sean Hefty <[email protected]> Cc: Hal Rosenstock <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2008-05-20ide: fix race in device_createGreg Kroah-Hartman1-3/+2
There is a race from when a device is created with device_create() and then the drvdata is set with a call to dev_set_drvdata() in which a sysfs file could be open, yet the drvdata will be NULL, causing all sorts of bad things to happen. This patch fixes the problem by using the new function, device_create_drvdata(). Cc: Kay Sievers <[email protected]> Acked-by: Bartlomiej Zolnierkiewicz <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2008-05-20fbdev: fix race in device_createGreg Kroah-Hartman1-3/+7
There is a race from when a device is created with device_create() and then the drvdata is set with a call to dev_set_drvdata() in which a sysfs file could be open, yet the drvdata will be NULL, causing all sorts of bad things to happen. This patch fixes the problem by using the new function, device_create_drvdata(). Cc: Kay Sievers <[email protected]> Cc: James Simmons <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2008-05-20mm: bdi: fix race in bdi_class device creationGreg Kroah-Hartman1-10/+2
There is a race from when a device is created with device_create() and then the drvdata is set with a call to dev_set_drvdata() in which a sysfs file could be open, yet the drvdata will be NULL, causing all sorts of bad things to happen. This patch fixes the problem by using the new function, device_create_vargs(). Many thanks to Arthur Jones <[email protected]> for reporting the bug, and testing patches out. Cc: Kay Sievers <[email protected]> Cc: Arthur Jones <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Miklos Szeredi <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2008-05-20Driver core: add device_create_vargs and device_create_drvdataGreg Kroah-Hartman2-6/+91
We want to have the drvdata field set properly when creating the device as sysfs callbacks can assume it is present and it can race the later setting of this field. So, create two new functions, deviec_create_vargs() and device_create_drvdata() that take this new field. device_create_drvdata() will go away in 2.6.27 as the drvdata field will just be moved to the device_create() call as it should be. Cc: Kay Sievers <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2008-05-20[CIFS] Enable DFS support for Unix query path infoSteve French4-50/+85
Final piece for handling DFS in unix_query_path_info, constructing a fake inode for the junction directory which the submount will cover. Acked-by: Igor Mammedov <[email protected]> Signed-off-by: Steve French <[email protected]>
2008-05-20Merge branch 'for-linus' of ↵Linus Torvalds2-5/+5
git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: PCI: correct mailing list address PCI: Correct last two HP entries in the bfsort whitelist
2008-05-20Merge branch 'for-linus' of ↵Linus Torvalds2-12/+22
git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: prevent userspace from accessing shut down devices ieee1394: sbp2: use correct size of command descriptor block
2008-05-20Fix a deadlock in the bttv driverArjan van de Ven3-2/+6
vidiocgmbuf() does this: mutex_lock(&fh->cap.vb_lock); retval = videobuf_mmap_setup(&fh->cap, gbuffers, gbufsize, V4L2_MEMORY_MMAP); and videobuf_mmap_setup() then just does mutex_lock(&q->vb_lock); ret = __videobuf_mmap_setup(q, bcount, bsize, memory); mutex_unlock(&q->vb_lock); which is an obvious double-take deadlock. This patch fixes this by having vidiocgmbuf() just call the __videobuf_mmap_setup function instead. Acked-by: Mauro Carvalho Chehab <[email protected]> Reported-by: Koos Vriezen <[email protected]> Signed-off-by: Arjan van de Ven <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-05-20firewire: prevent userspace from accessing shut down devicesJay Fenlason1-0/+14
If userspace ignores the POLLERR bit from poll(), and only attempts to read() the device when POLLIN is set, it can still make ioctl() calls on a device that has been removed from the system. The node_id and generation returned by GET_INFO will be outdated, but INITIATE_BUS_RESET would still cause a bus reset, and GET_CYCLE_TIMER will return data. And if you guess the correct generation to use, you can send requests to a different device on the bus, and get responses back. This patch prevents open, ioctl, compat_ioctl, and mmap against shutdown devices. Signed-off-by: Jay Fenlason <[email protected]> Signed-off-by: Stefan Richter <[email protected]>
2008-05-20ieee1394: sbp2: use correct size of command descriptor blockStefan Richter1-12/+8
Boaz Harrosh wrote: > cmd->cmd_len is now guarantied to be set properly at all cases. > And some commands you want to support will not be set correctly > by COMMAND_SIZE(). Signed-off-by: Stefan Richter <[email protected]>
2008-05-20Merge branch 'for-linus' of ↵Linus Torvalds3-53/+34
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: [ALSA] hda - Fix ASUS P5GD1 model [ALSA] hda - Fix ALC262 fujitsu model snd-pcsp: use HRTIMER_CB_SOFTIRQ
2008-05-20Merge branch 'for-linus' of ↵Linus Torvalds7-33/+34
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: remove CVS keywords HID: Add iMON LCDs to blacklist HID: add Microchip PICKit 1 and PICkit 2 to blacklist HID: split Numlock emulation quirk from HID_QUIRK_APPLE_HAS_FN.
2008-05-20Merge branch 'merge' of ↵Linus Torvalds12-555/+675
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Update defconfigs for desktop/server systems [POWERPC] Fix mpc8377_mds.dts DMA nodes to match spec [POWERPC] Update arch/powerpc/boot/.gitignore [POWERPC] Remove generated files on make clean [POWERPC] powerpc/mm/hash_low_32.S: Remove CVS keyword [POWERPC] Update Cell MAINTAINERS entry, add spufs entry lmb: Fix compile warning
2008-05-20Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixesLinus Torvalds7-18/+23
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes: [GFS2] Prefer strlcpy() over snprintf() [GFS2] Fix cast from unsigned int to s64 [GFS2] filesystem consistency error from do_strip
2008-05-20x86: strengthen 64-bit p?d_bad()Hugh Dickins1-6/+6
The x86_64 pgd_bad(), pud_bad(), pmd_bad() inlines have differed from their x86_32 counterparts in a couple of ways: they've been unnecessarily weak (e.g. letting 0 or 1 count as good), and were typed as unsigned long. Strengthen them and return int. The PAE pmd_bad was too weak before, allowing any junk in the upper half; but got strengthened by the patch correcting its ~PAGE_MASK to ~PTE_MASK. The PAE pud_bad already said ~PTE_MASK; and since it folds into pgd_bad, and we don't set the protection bits at that level, it'll do as is. Signed-off-by: Hugh Dickins <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-05-20xen: use PTE_MASK in pte_mfn()Jeremy Fitzhardinge1-1/+1
Use PTE_MASK to extract mfn from pte. Signed-off-by: Jeremy Fitzhardinge <[email protected]> Tested-by: Hugh Dickins <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-05-20x86: use PTE_MASK rather than ad-hoc maskJeremy Fitzhardinge1-1/+1
Use ~PTE_MASK to extract the non-pfn parts of the pte (ie, the pte flags), rather than constructing an ad-hoc mask. Signed-off-by: Jeremy Fitzhardinge <[email protected]> Tested-by: Hugh Dickins <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-05-20x86: clarify use of _PAGE_CHG_MASKJeremy Fitzhardinge1-0/+1
_PAGE_CHG_MASK is defined as the set of bits not updated by pte_modify(); specifically, the pfn itself, and the Accessed and Dirty bits (which are updated by hardware). Signed-off-by: Jeremy Fitzhardinge <[email protected]> Tested-by: Hugh Dickins <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-05-20x86: use PTE_MASK in pgtable_32.hJeremy Fitzhardinge1-2/+2
Signed-off-by: Linus Torvalds <[email protected]>
2008-05-20x86: use PTE_MASK in 32-bit PAEJeremy Fitzhardinge1-3/+3
Use PTE_MASK in 3-level pagetables (ie, 32-bit PAE). Signed-off-by: Jeremy Fitzhardinge <[email protected]> Tested-by: Hugh Dickins <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-05-20x86: rearrange __(VIRTUAL|PHYSICAL)_MASKJeremy Fitzhardinge1-3/+3
Put the definitions of __(VIRTUAL|PHYSICAL)_MASK before their uses. Signed-off-by: Jeremy Fitzhardinge <[email protected]> Tested-by: Hugh Dickins <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-05-20x86: fix warning on 32-bit non-PAEJeremy Fitzhardinge1-1/+1
Fix the warning: include2/asm/pgtable.h: In function `pte_modify': include2/asm/pgtable.h:290: warning: left shift count >= width of type On 32-bit PAE the virtual and physical addresses are both 32-bits, so it ends up evaluating 1<<32. Do the shift as a 64-bit shift then cast to the appropriate size. This should all be done at compile time, and so have no effect on generated code. Signed-off-by: Jeremy Fitzhardinge <[email protected]> Tested-by: Hugh Dickins <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-05-20x86: define PTE_MASK in a universally useful wayJeremy Fitzhardinge1-4/+9
Define PTE_MASK so that it contains a meaningful value for all x86 pagetable configurations. Previously it was defined as a "long" which means that it was too short to cover a 32-bit PAE pte entry. It is now defined as a pteval_t, which is an integer type long enough to contain a full pte (or pmd, pud, pgd). This fixes an Xorg crash on 32-bit x86 with PAE due to corruption of the NX bit in mprotect due to the incorrect type/value of PTE_MASK reported by Hugh Dickins: "Yes, thanks Jeremy: I've checked that each stage builds and runs X on my boxes here, x86_32 and x86_32+PAE and x86_64. (So even 1/8 is enough to fix the PAT pte_modify issue, though 2/8 then fixes compiler warnings.)" Signed-off-by: Jeremy Fitzhardinge <[email protected]> Tested-by: Hugh Dickins <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-05-20HID: remove CVS keywordsAdrian Bunk6-12/+0
This patch removes CVS keywords that weren't updated for a long time from comments. Signed-off-by: Adrian Bunk <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
2008-05-20HID: Add iMON LCDs to blacklistDylan R Semler1-0/+4
The new iMON LCDs from SoundGraph need to be blacklisted from HID in order to be used by lirc. Signed-off-by: Dylan R Semler <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
2008-05-20HID: add Microchip PICKit 1 and PICkit 2 to blacklistXiaofan Chen1-0/+7
Microchip PICkit 1 and PICKit 2 USB Programmers are USB HID class of device but they are not real HID device. They are now supported by libusb based programs like the following programs. pk2 and pk2cmd Linux port: http://home.pacbell.net/theposts/picmicro/ usb_pickit: http://tfc.duke.free.fr/pickit.html usb_pickit original version: http://charm.cs.uiuc.edu/users/olawlor/projects/2003/microchip/ Therefore it ispreferred to blacklist them. Signed-off-by: Xiaofan Chen <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.