1. 15 Sep, 2010 4 commits
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/mtd-2.6 · 65e0b598
      Linus Torvalds authored
      * git://git.infradead.org/mtd-2.6:
        mtd: pxa3xx: fix build error when CONFIG_MTD_PARTITIONS is not defined
        mtd: mxc_nand: configure pages per block for v2 controller
        mtd: OneNAND: Fix loop hang when DMA error at Samsung SoCs
        mtd: OneNAND: Fix 2KiB pagesize handling at Samsung SoCs
        mtd: Blackfin NFC: fix invalid free in remove()
        mtd: Blackfin NFC: fix build error after nand_scan_ident() change
        mxc_nand: Do not do byte accesses to the NFC buffer.
      65e0b598
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · d7a4b63b
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: fix hiddev's use of usb_find_interface
        HID: fixup blacklist entry for Asus T91MT
        HID: add device ID for new Asus Multitouch Controller
        HID: add no-get quirk for eGalax touch controller
        HID: Add quirk for eGalax touch controler.
        HID: add support for another BTC Emprex remote control
        HID: Set Report ID properly for Output reports on the Control endpoint.
        HID: Kanvus Note A5 tablet needs HID_QUIRK_MULTI_INPUT
        HID: Add support for chicony multitouch screens.
      d7a4b63b
    • Linus Torvalds's avatar
      Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · de8d4f5d
      Linus Torvalds authored
      * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
        SUNRPC: Fix the NFSv4 and RPCSEC_GSS Kconfig dependencies
        statfs() gives ESTALE error
        NFS: Fix a typo in nfs_sockaddr_match_ipaddr6
        sunrpc: increase MAX_HASHTABLE_BITS to 14
        gss:spkm3 miss returning error to caller when import security context
        gss:krb5 miss returning error to caller when import security context
        Remove incorrect do_vfs_lock message
        SUNRPC: cleanup state-machine ordering
        SUNRPC: Fix a race in rpc_info_open
        SUNRPC: Fix race corrupting rpc upcall
        Fix null dereference in call_allocate
      de8d4f5d
    • Jeff Moyer's avatar
      aio: check for multiplication overflow in do_io_submit · 75e1c70f
      Jeff Moyer authored
      Tavis Ormandy pointed out that do_io_submit does not do proper bounds
      checking on the passed-in iocb array:
      
             if (unlikely(nr < 0))
                     return -EINVAL;
      
             if (unlikely(!access_ok(VERIFY_READ, iocbpp, (nr*sizeof(iocbpp)))))
                     return -EFAULT;                      ^^^^^^^^^^^^^^^^^^
      
      The attached patch checks for overflow, and if it is detected, the
      number of iocbs submitted is scaled down to a number that will fit in
      the long.  This is an ok thing to do, as sys_io_submit is documented as
      returning the number of iocbs submitted, so callers should handle a
      return value of less than the 'nr' argument passed in.
      Reported-by: default avatarTavis Ormandy <taviso@cmpxchg8b.com>
      Signed-off-by: default avatarJeff Moyer <jmoyer@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      75e1c70f
  2. 14 Sep, 2010 1 commit
    • Guillaume Chazarain's avatar
      HID: fix hiddev's use of usb_find_interface · 8fe294ca
      Guillaume Chazarain authored
      My macbook infrared remote control was broken by commit
      bd25f4dd ("HID: hiddev: use
      usb_find_interface, get rid of BKL").
      
      This device appears in dmesg as:
      apple 0003:05AC:8242.0001: hiddev0,hidraw0: USB HID v1.11 Device
      [Apple Computer, Inc. IR Receiver] on usb-0000:00:1d.2-1/input0
      
      It stopped working as lircd was getting ENODEV when opening /dev/usb/hiddev0.
      
      AFAICS hiddev_driver is a dummy driver so usb_find_interface(&hiddev_driver)
      does not find anything.
      
      The device is associated with the usbhid driver, so let's do
      usb_find_interface(&hid_driver) instead.
      
      $ ls -l /sys/devices/pci0000:00/0000:00:1d.2/usb7/7-1/7-1:1.0/usb/hiddev0/device/driver
      lrwxrwxrwx 1 root root 0 2010-09-12 16:28 /sys/devices/pci0000:00/0000:00:1d.2/usb7/7-1/7-1:1.0/usb/hiddev0/device/driver -> ../../../../../../bus/usb/drivers/usbhid
      Signed-off-by: default avatarGuillaume Chazarain <guichaz@gmail.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      8fe294ca
  3. 13 Sep, 2010 20 commits
  4. 12 Sep, 2010 12 commits
  5. 11 Sep, 2010 3 commits