1. 25 Apr, 2011 7 commits
  2. 23 Apr, 2011 1 commit
  3. 19 Apr, 2011 25 commits
  4. 18 Apr, 2011 7 commits
    • Linus Torvalds's avatar
      Merge branch 'for-39-rc4' of git://codeaurora.org/quic/kernel/davidb/linux-msm · e024f69d
      Linus Torvalds authored
      * 'for-39-rc4' of git://codeaurora.org/quic/kernel/davidb/linux-msm:
        msm: timer: fix missing return value
        msm: Remove extraneous ffa device check
      e024f69d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 96fd2d57
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: xen-kbdfront - fix mouse getting stuck after save/restore
        Input: estimate number of events per packet
        Input: evdev - indicate buffer overrun with SYN_DROPPED
        Input: document event types and codes and their intended use
        Input: add KEY_IMAGES specifically for AL Image Browser
        Input: twl4030_keypad - fix potential NULL dereference in twl4030_kp_probe()
        Input: h3600_ts - fix error handling at connect
        Input: twl4030_keypad - avoid potential NULL-pointer dereference
      96fd2d57
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block · 8a83f331
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
        block: add blk_run_queue_async
        block: blk_delay_queue() should use kblockd workqueue
        md: fix up raid1/raid10 unplugging.
        md: incorporate new plugging into raid5.
        md: provide generic support for handling unplug callbacks.
        md - remove old plugging code.
        md/dm - remove remains of plug_fn callback.
        md: use new plugging interface for RAID IO.
        block: drop queue lock before calling __blk_run_queue() for kblockd punt
        Revert "block: add callback function for unplug notification"
        block: Enhance new plugging support to support general callbacks
      8a83f331
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 5d5b1b9f
      Linus Torvalds authored
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc/powermac: Build fix with SMP and CPU hotplug
        powerpc/perf_event: Skip updating kernel counters if register value shrinks
        powerpc: Don't write protect kernel text with CONFIG_DYNAMIC_FTRACE enabled
        powerpc: Fix oops if scan_dispatch_log is called too early
        powerpc/pseries: Use a kmem cache for DTL buffers
        powerpc/kexec: Fix regression causing compile failure on UP
        powerpc/85xx: disable Suspend support if SMP enabled
        powerpc/e500mc: Remove CPU_FTR_MAYBE_CAN_NAP/CPU_FTR_MAYBE_CAN_DOZE
        powerpc/book3e: Fix CPU feature handling on 64-bit e5500
        powerpc: Check device status before adding serial device
        powerpc/85xx: Don't add disabled PCIe devices
      5d5b1b9f
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable · adff377b
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (24 commits)
        Btrfs: fix free space cache leak
        Btrfs: avoid taking the chunk_mutex in do_chunk_alloc
        Btrfs end_bio_extent_readpage should look for locked bits
        Btrfs: don't force chunk allocation in find_free_extent
        Btrfs: Check validity before setting an acl
        Btrfs: Fix incorrect inode nlink in btrfs_link()
        Btrfs: Check if btrfs_next_leaf() returns error in btrfs_real_readdir()
        Btrfs: Check if btrfs_next_leaf() returns error in btrfs_listxattr()
        Btrfs: make uncache_state unconditional
        btrfs: using cached extent_state in set/unlock combinations
        Btrfs: avoid taking the trans_mutex in btrfs_end_transaction
        Btrfs: fix subvolume mount by name problem when default mount subvolume is set
        fix user annotation in ioctl.c
        Btrfs: check for duplicate iov_base's when doing dio reads
        btrfs: properly handle overlapping areas in memmove_extent_buffer
        Btrfs: fix memory leaks in btrfs_new_inode()
        Btrfs: check for duplicate iov_base's when doing dio reads
        Btrfs: reuse the extent_map we found when calling btrfs_get_extent
        Btrfs: do not use async submit for small DIO io's
        Btrfs: don't split dio bios if we don't have to
        ...
      adff377b
    • Linus Torvalds's avatar
      proc: do proper range check on readdir offset · d8bdc59f
      Linus Torvalds authored
      Rather than pass in some random truncated offset to the pid-related
      functions, check that the offset is in range up-front.
      
      This is just cleanup, the previous commit fixed the real problem.
      
      Cc: stable@kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d8bdc59f
    • Linus Torvalds's avatar
      next_pidmap: fix overflow condition · c78193e9
      Linus Torvalds authored
      next_pidmap() just quietly accepted whatever 'last' pid that was passed
      in, which is not all that safe when one of the users is /proc.
      
      Admittedly the proc code should do some sanity checking on the range
      (and that will be the next commit), but that doesn't mean that the
      helper functions should just do that pidmap pointer arithmetic without
      checking the range of its arguments.
      
      So clamp 'last' to PID_MAX_LIMIT.  The fact that we then do "last+1"
      doesn't really matter, the for-loop does check against the end of the
      pidmap array properly (it's only the actual pointer arithmetic overflow
      case we need to worry about, and going one bit beyond isn't going to
      overflow).
      
      [ Use PID_MAX_LIMIT rather than pid_max as per Eric Biederman ]
      Reported-by: default avatarTavis Ormandy <taviso@cmpxchg8b.com>
      Analyzed-by: default avatarRobert Święcki <robert@swiecki.net>
      Cc: Eric W. Biederman <ebiederm@xmission.com>
      Cc: Pavel Emelyanov <xemul@openvz.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      c78193e9