1. 20 Jun, 2009 10 commits
    • Linus Torvalds's avatar
      Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 · e6423407
      Linus Torvalds authored
      * 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (34 commits)
        ide-cd: prevent null pointer deref via cdrom_newpc_intr
        ide: BUG() on unknown requests
        ide: filter out invalid DMA xfer mode changes in HDIO_DRIVE_CMD ioctl handler
        ide: do not access ide_drive_t 'drive_data' field directly
        sl82c105: implement test_irq() method
        siimage: implement test_irq() method
        pdc202xx_old: implement test_irq() method (take 2)
        cmd64x: implement test_irq() method
        cmd640: implement test_irq() method
        ide: move ack_intr() method into 'struct ide_port_ops' (take 2)
        ide: move IRQ clearing from ack_intr() method to clear_irq() method (take 2)
        siimage: use ide_dma_test_irq() (take 2)
        cmd64x: implement clear_irq() method (take 2)
        ide: call clear_irq() method in ide_timer_expiry()
        sgiioc4: coding style cleanup
        ide: don't enable IORDY at a probe time
        ide: IORDY handling fixes
        ata: add ata_id_pio_need_iordy() helper (v2)
        ide-tape: fix build issue
        ide: unify interrupt reason checking
        ...
      e6423407
    • Linus Torvalds's avatar
      x86: don't use 'access_ok()' as a range check in get_user_pages_fast() · 7f818906
      Linus Torvalds authored
      It's really not right to use 'access_ok()', since that is meant for the
      normal "get_user()" and "copy_from/to_user()" accesses, which are done
      through the TLB, rather than through the page tables.
      
      Why? access_ok() does both too few, and too many checks.  Too many,
      because it is meant for regular kernel accesses that will not honor the
      'user' bit in the page tables, and because it honors the USER_DS vs
      KERNEL_DS distinction that we shouldn't care about in GUP.  And too few,
      because it doesn't do the 'canonical' check on the address on x86-64,
      since the TLB will do that for us.
      
      So instead of using a function that isn't meant for this, and does
      something else and much more complicated, just do the real rules: we
      don't want the range to overflow, and on x86-64, we want it to be a
      canonical low address (on 32-bit, all addresses are canonical).
      Acked-by: default avatarIngo Molnar <mingo@elte.hu>
      Cc: H. Peter Anvin <hpa@zytor.com>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      7f818906
    • Rainer Weikusat's avatar
      ide-cd: prevent null pointer deref via cdrom_newpc_intr · 39c58f37
      Rainer Weikusat authored
      With 2.6.30, the error handling code in cdrom_newpc_intr was changed
      to deal with partial request failures by normally completing the 'good'
      parts of a request and only 'error' the last (and presumably,
      incompletely transferred) bio associated with a particular
      request. In order to do this, ide_complete_rq is called over
      ide_cd_error_cmd() to partially complete the rq. The block layer
      does partial completion only for requests with bio's and if the
      rq doesn't have one (eg 'GPCMD_READ_DISC_INFO') the request is
      completed as a whole and the drive->hwif->rq pointer set to NULL
      afterwards. When calling ide_complete_rq again to report
      the error, this null pointer is derefenced, resulting in a kernel
      crash.
      
      This fixes http://bugzilla.kernel.org/show_bug.cgi?id=13399.
      Signed-off-by: default avatarRainer Weikusat <rweikusat@mssgmbh.com>
      Signed-off-by: default avatarBorislav Petkov <petkovbb@gmail.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      39c58f37
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · fb20871a
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (342 commits)
        Staging: comedi: fix build errors
        Staging: udlfb: update to version 0.2.3
        Staging: udlfb: fix some sparse warnings.
        Staging: udlfb: clean up checkpatch warnings in udlfb.c
        Staging: udlfb: clean up checkpatch warnings in udlfb.h
        Staging: udlfb: add udlfb driver to build
        Staging: add udlfb driver
        Staging: pata_rdc: remove pointless comments
        Staging: pata_rdc: remove DRIVER macros
        Staging: pata_rdc: remove dbgprintf macro
        Staging: pata_rdc: remove broken flag
        Staging: pata_rdc: fix build warnings
        Staging: pata_rdc: use PCI_DEVICE
        Staging: pata_rdc: remove function prototypes
        Staging: pata_rdc: coding style fixes
        Staging: pata_rdc: convert code to work in 2.6.29
        Staging: pata_rdc: add driver to the build system
        Staging: add pata_rdc driver
        Staging: remove obsolete serqt_usb driver
        Staging: serqt_usb2 add the driver to the build
        ...
      fb20871a
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify · bee89ab2
      Linus Torvalds authored
      * 'for-linus' of git://git.infradead.org/users/eparis/notify:
        inotify: inotify_destroy_mark_entry could get called twice
      bee89ab2
    • Linus Torvalds's avatar
      Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 5c6fb005
      Linus Torvalds authored
      * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        i2c: New macro to initialize i2c address lists on the fly
        i2c: Don't advertise i2c functions when not available
        i2c: Use rwsem instead of mutex for board info
        i2c: Add a sysfs interface to instantiate devices
        i2c: Limit core locking to the necessary sections
        i2c: Kill the redundant client list
        i2c: Kill is_newstyle_driver
        i2c: Merge i2c_attach_client into i2c_new_device
        i2c: Drop i2c_probe function
        i2c: Get rid of the legacy binding model
        i2c: Kill client_register and client_unregister methods
      5c6fb005
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block · 31583d6a
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
        Fix kernel-doc parameter name typo in blk-settings.c:
        block: rename CONFIG_LBD to CONFIG_LBDAF
        block: Fix bounce_pfn setting
        hd: stop defining MAJOR_NR
      31583d6a
    • Linus Torvalds's avatar
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 773d7a09
      Linus Torvalds authored
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (35 commits)
        powerpc/5121: make clock debug output more readable
        powerpc/5xxx: Add common mpc5xxx_get_bus_frequency() function
        powerpc/5200: Update pcm030.dts to add i2c eeprom and delete cruft
        powerpc/5200: convert mpc52xx_psc_spi to use cs_control callback
        fbdev/xilinxfb: Fix improper casting and tighen up probe path
        usb/ps3: Add missing annotations
        powerpc: Add memory clobber to mtspr()
        powerpc: Fix invalid construct in our CPU selection Kconfig
        ps3rom: Use ps3_system_bus_[gs]et_drvdata() instead of direct access
        powerpc: Add configurable -Werror for arch/powerpc
        of_serial: Add UPF_FIXED_TYPE flag
        drivers/hvc: Add missing __devexit_p()
        net/ps3: gelic - Add missing annotations
        powerpc: Introduce macro spin_event_timeout()
        powerpc/warp: Fix ISA_DMA_THRESHOLD default
        powerpc/bootwrapper: Custom build options for XPedite52xx targets
        powerpc/85xx: Add defconfig for X-ES MPC85xx boards
        powerpc/85xx: Add dts files for X-ES MPC85xx boards
        powerpc/85xx: Add platform support for X-ES MPC85xx boards
        83xx: add support for the kmeter1 board.
        ...
      773d7a09
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin · 17fad520
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
        Blackfin: convert page/tlb to asm-generic
        Blackfin: convert types to asm-generic
        Blackfin: convert irq/process to asm-generic
        Blackfin: convert signal/mmap to asm-generic
        Blackfin: convert locking primitives to asm-generic
        Blackfin: convert termios to asm-generic
        Blackfin: convert simple headers to asm-generic
        Blackfin: convert socket/poll to asm-generic
        Blackfin: convert user/elf to asm-generic
        Blackfin: convert shm/sysv/ipc to asm-generic
        Blackfin: convert asm/ioctls.h to asm-generic/ioctls.h
        Blackfin: only build irqpanic.c when needed
        Blackfin: pull in asm/io.h in ksyms for prototypes
        Blackfin: use common test_bit() rather than __test_bit()
      17fad520
  2. 19 Jun, 2009 30 commits