03 May, 2011

1 commit


20 Apr, 2011

1 commit


19 Apr, 2011

12 commits

  • James Morris
     
  • In tomoyo_flush(), head->r.w[0] holds pointer to string data to be printed.
    But head->r.w[0] was updated only when the string data was partially
    printed (because head->r.w[0] will be updated by head->r.w[1] later if
    completely printed). However, regarding /sys/kernel/security/tomoyo/query ,
    an additional '\0' is printed after the string data was completely printed.
    But if free space for read buffer became 0 before printing the additional '\0',
    tomoyo_flush() was returning without updating head->r.w[0]. As a result,
    tomoyo_flush() forever reprints already printed string data.

    Signed-off-by: Tetsuo Handa
    Signed-off-by: James Morris

    Tetsuo Handa
     
  • "mount --bind /path/to/file1 /path/to/file2" is legal. Therefore,
    "umount /path/to/file2" is also legal. Do not automatically append trailing '/'
    if pathname to be unmounted does not end with '/'.

    Signed-off-by: Tetsuo Handa
    Signed-off-by: James Morris

    Tetsuo Handa
     
  • In tomoyo_write_profile() since 2.6.34, a lock was by error missing when
    replacing profile's comment line. If multiple threads attempted

    echo '0-COMMENT=comment' > /sys/kernel/security/tomoyo/profile

    in parallel, garbage collector will fail to kfree() the old value.
    Protect the replacement using a lock. Also, keep the old value rather than
    replace with empty string when out of memory error has occurred.

    Signed-off-by: Xiaochen Wang
    Signed-off-by: Tetsuo Handa
    Signed-off-by: James Morris

    Tetsuo Handa
     
  • * '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

    Linus Torvalds
     
  • * '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

    Linus Torvalds
     
  • * '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

    Linus Torvalds
     
  • * 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
    ...

    Linus Torvalds
     
  • 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: Linus Torvalds

    Linus Torvalds
     
  • 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: Tavis Ormandy
    Analyzed-by: Robert Święcki
    Cc: Eric W. Biederman
    Cc: Pavel Emelyanov
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • Mouse gets "stuck" after restore of PV guest but buttons are in working
    condition.

    If driver has been configured for ABS coordinates at start it will get
    XENKBD_TYPE_POS events and then suddenly after restore it'll start getting
    XENKBD_TYPE_MOTION events, that will be dropped later and they won't get
    into user-space.

    Regression was introduced by hunk 5 and 6 of
    5ea5254aa0ad269cfbd2875c973ef25ab5b5e9db
    ("Input: xen-kbdfront - advertise either absolute or relative
    coordinates").

    Driver on restore should ask xen for request-abs-pointer again if it is
    available. So restore parts that did it before 5ea5254.

    Acked-by: Olaf Hering
    Signed-off-by: Igor Mammedov
    [v1: Expanded the commit description]
    Signed-off-by: Konrad Rzeszutek Wilk
    Signed-off-by: Dmitry Torokhov

    Igor Mammedov
     
  • Calculate a default based on the number of ABS axes, REL axes,
    and MT slots for the device during input device registration.

    Signed-off-by: Jeff Brown
    Reviewed-by: Henrik Rydberg
    Signed-off-by: Dmitry Torokhov

    Jeff Brown
     

18 Apr, 2011

26 commits