Skip to content
Commits on Mar 26, 2013
  1. Added RoW block I/O scheduler.

    committed Mar 27, 2013
Commits on Feb 19, 2013
  1. Merge branches 'blx_JB', 'colorcontrol_JB', 'customvoltage_JB', 'fsyn…

    …ccontrol_JB', 'liveoc_JB', 'sio_JB', 'slqb_JB', 'soundcontrol_JB', 'tempcontrol_JB', 'various_JB', 'vibratorcontrol_JB' and 'wheatley_JB' into glados-cfs_JB
    committed Feb 19, 2013
Commits on Nov 28, 2012
  1. @amluto @toddpoynor

    mm: Hold a file reference in madvise_remove

    commit 9ab4233dd08036fe34a89c7dc6f47a8bf2eb29eb upstream.
    
    Otherwise the code races with munmap (causing a use-after-free
    of the vma) or with close (causing a use-after-free of the struct
    file).
    
    The bug was introduced by commit 90ed52e ("[PATCH] holepunch: fix
    mmap_sem i_mutex deadlock")
    
    [bwh: Backported to 3.2:
     - Adjust context
     - madvise_remove() calls vmtruncate_range(), not do_fallocate()]
    [luto: Backported to 3.0: Adjust context]
    
    Cc: Hugh Dickins <hugh@veritas.com>
    Cc: Miklos Szeredi <mszeredi@suse.cz>
    Cc: Badari Pulavarty <pbadari@us.ibm.com>
    Cc: Nick Piggin <npiggin@suse.de>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Signed-off-by: Andy Lutomirski <luto@amacapital.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    amluto committed with toddpoynor Jul 5, 2012
Commits on Nov 27, 2012
  1. Merge branch 'linux-omap-3.0' into android-omap-3.0

    Erik Gilling committed Nov 26, 2012
  2. @ajs1984

    gpu: pvr: Update to DDK 1.8@2198402

     - Implemented a DC API change which queues a dummy display flip to
       workaround a rare and difficult to reproduce synchronization
       deadlock.
     - Eliminate log spam from Linux shrinker integration.
    ajs1984 committed with Erik Gilling Nov 16, 2012
Commits on Nov 16, 2012
  1. net: wireless: bcmdhd: Enable P2P probe request handling only during …

    …discovery
    
    Change-Id: I2db29d5ed7f66f2a45feb890c81d510fcad24dd2
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
    Jithu Jance committed with Dmitry Shmidt Nov 15, 2012
Commits on Nov 2, 2012
  1. Revert "net: wireless: bcmdhd: Fix WD wakelock behavior"

    This reverts commit 834029a.
    Dmitry Shmidt committed Nov 2, 2012
Commits on Nov 1, 2012
  1. @kees @toddpoynor

    use clamp_t in UNAME26 fix

    commit 31fd84b95eb211d5db460a1dda85e004800a7b52 upstream.
    
    The min/max call needed to have explicit types on some architectures
    (e.g. mn10300). Use clamp_t instead to avoid the warning:
    
      kernel/sys.c: In function 'override_release':
      kernel/sys.c:1287:10: warning: comparison of distinct pointer types lacks a cast [enabled by default]
    
    Reported-by: Fengguang Wu <fengguang.wu@intel.com>
    Signed-off-by: Kees Cook <keescook@chromium.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    kees committed with toddpoynor Oct 19, 2012
  2. @kees @toddpoynor

    kernel/sys.c: fix stack memory content leak via UNAME26

    commit 2702b1526c7278c4d65d78de209a465d4de2885e upstream.
    
    Calling uname() with the UNAME26 personality set allows a leak of kernel
    stack contents.  This fixes it by defensively calculating the length of
    copy_to_user() call, making the len argument unsigned, and initializing
    the stack buffer to zero (now technically unneeded, but hey, overkill).
    
    CVE-2012-0957
    
    Reported-by: PaX Team <pageexec@freemail.hu>
    Signed-off-by: Kees Cook <keescook@chromium.org>
    Cc: Andi Kleen <ak@linux.intel.com>
    Cc: PaX Team <pageexec@freemail.hu>
    Cc: Brad Spengler <spender@grsecurity.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    kees committed with toddpoynor Oct 19, 2012
Commits on Oct 24, 2012
  1. Merge branch 'android-omap-3.0' into android-omap-tuna-3.0

    Dmitry Shmidt committed Oct 24, 2012
  2. Merge branch 'android-3.0' into android-omap-3.0

    Dmitry Shmidt committed Oct 24, 2012
  3. net: wireless: bcmdhd: Fix WD wakelock behavior

    Change-Id: I7ebae2be248cbb4bc98e2b448641f65b77a320f4
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
    
    Conflicts:
    
    	drivers/net/wireless/bcmdhd/dhd_linux.c
    Dmitry Shmidt committed Oct 23, 2012
  4. net: wireless: bcmdhd: Fix BSSID report for disassoc

    Change-Id: I5e3b01a1a471e5983ab934fc9d65802a389ab1af
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
    Dmitry Shmidt committed Oct 24, 2012
Commits on Sep 26, 2012
  1. @toddpoynor
  2. @toddpoynor
  3. @colincross

    timekeeping: fix 32-bit overflow in get_monotonic_boottime

    get_monotonic_boottime adds three nanonsecond values stored
    in longs, followed by an s64.  If the long values are all
    close to 1e9 the first three additions can overflow and
    become negative when added to the s64.  Cast the first
    value to s64 so that all additions are 64 bit.
    
    Change-Id: Ic996d8b6fbef0b72f2d027b0d8ef5259b5c1a540
    Signed-off-by: Colin Cross <ccross@android.com>
    colincross committed Sep 26, 2012
Commits on Sep 20, 2012
  1. Merge branch 'android-omap-3.0' into android-omap-tuna-3.0

    Dmitry Shmidt committed Sep 20, 2012
  2. Merge branch 'android-3.0' into android-omap-3.0

    Dmitry Shmidt committed Sep 20, 2012
  3. net: wireless: bcmdhd: Adjust roaming treshold to -65 dB

    Change-Id: I88bb0cf759ee4262f31f054ef2dd5fc6258e8628
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
    Dmitry Shmidt committed Sep 20, 2012
Commits on Sep 17, 2012
  1. Merge branch 'android-omap-3.0' into android-omap-tuna-3.0

    Dmitry Shmidt committed Sep 17, 2012
  2. Merge branch 'android-3.0' into android-omap-3.0

    Dmitry Shmidt committed Sep 17, 2012
Something went wrong with that request. Please try again.