1. 12 Dec, 2013 3 commits
    • Linus Torvalds's avatar
      Merge tag 'xfs-for-linus-v3.13-rc4' of git://oss.sgi.com/xfs/xfs · 48a2f0b2
      Linus Torvalds authored
      Pull xfs bugfixes from Ben Myers:
      
       - fix for buffer overrun in agfl with growfs on v4 superblock
      
       - return EINVAL if requested discard length is less than a block
      
       - fix possible memory corruption in xfs_attrlist_by_handle()
      
      * tag 'xfs-for-linus-v3.13-rc4' of git://oss.sgi.com/xfs/xfs:
        xfs: growfs overruns AGFL buffer on V4 filesystems
        xfs: don't perform discard if the given range length is less than block size
        xfs: underflow bug in xfs_attrlist_by_handle()
      48a2f0b2
    • Linus Torvalds's avatar
      futex: move user address verification up to common code · 5cdec2d8
      Linus Torvalds authored
      When debugging the read-only hugepage case, I was confused by the fact
      that get_futex_key() did an access_ok() only for the non-shared futex
      case, since the user address checking really isn't in any way specific
      to the private key handling.
      
      Now, it turns out that the shared key handling does effectively do the
      equivalent checks inside get_user_pages_fast() (it doesn't actually
      check the address range on x86, but does check the page protections for
      being a user page).  So it wasn't actually a bug, but the fact that we
      treat the address differently for private and shared futexes threw me
      for a loop.
      
      Just move the check up, so that it gets done for both cases.  Also, use
      the 'rw' parameter for the type, even if it doesn't actually matter any
      more (it's a historical artifact of the old racy i386 "page faults from
      kernel space don't check write protections").
      
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      5cdec2d8
    • Linus Torvalds's avatar
      futex: fix handling of read-only-mapped hugepages · f12d5bfc
      Linus Torvalds authored
      The hugepage code had the exact same bug that regular pages had in
      commit 7485d0d3 ("futexes: Remove rw parameter from
      get_futex_key()").
      
      The regular page case was fixed by commit 9ea71503 ("futex: Fix
      regression with read only mappings"), but the transparent hugepage case
      (added in a5b338f2: "thp: update futex compound knowledge") case
      remained broken.
      
      Found by Dave Jones and his trinity tool.
      Reported-and-tested-by: default avatarDave Jones <davej@fedoraproject.org>
      Cc: stable@kernel.org # v2.6.38+
      Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Cc: Mel Gorman <mgorman@suse.de>
      Cc: Darren Hart <dvhart@linux.intel.com>
      Cc: Andrea Arcangeli <aarcange@redhat.com>
      Cc: Oleg Nesterov <oleg@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      f12d5bfc
  2. 10 Dec, 2013 24 commits
  3. 09 Dec, 2013 11 commits
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 78fd8223
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "This is probably a bit big, but just because I fell behind last week
        and didn't get to doing any pulls, so stuff backed up behind me, I
        actually should have sent this for -rc3 but failed to even manage
        that.
      
        So this has radeon, intel, nouveau, vmware, exynos and tegra fixes in
        it, and the line count isn't all the bad in the end"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (50 commits)
        drm: fix the addition of the side-by-side (half) flag for extra 3D modes
        drm/edid: fix length check when adding extra 3D modes
        drm/radeon/atom: fix bus probes when hw_i2c is set (v2)
        drm/radeon: fix null pointer dereference in dce6+ audio code
        drm/radeon: fixup bad vram size on SI
        udl: fix issue with imported prime buffers
        drm/vmwgfx: Add our connectors to sysfs
        drm/vmwgfx: Fix dma buffer memory size accounting
        drm/vmwgfx: Fix up and comment the dumb buffer implementation
        drm/vmwgfx: Correctly set the enabled state on crtcs
        drm/nv50/disp: min/max are reversed in nv50_crtc_gamma_set()
        drm/nouveau/sw: fix oops if gpu has its display block disabled
        drm/nouveau: unreference fence after syncing
        drm/nouveau/kms: send timestamp data for correct head in flip completion events
        drm/nouveau/clk: Add support for NVAA/NVAC
        drm/nouveau/fifo: Hook up pause and resume for NV50 and NV84+
        drm/nv10/plane: some chipsets don't support NV12
        drm/nv10/plane: add downscaling restrictions
        drm/nv10/plane: fix format computation
        drm/nv04-nv30/clk: provide an empty domain list
        ...
      78fd8223
    • Linus Torvalds's avatar
      Merge tag 'mfd-fixes-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes · 32ac4869
      Linus Torvalds authored
      Pull mfd fixes from Samuel Ortiz:
       "This is the first 3.13 pull request for MFD fixes.  We have:
      
         - A ti-ssp build failure fix
         - An as3722 build failure fix
         - An lpc_ich copy paste error fix"
      
      * tag 'mfd-fixes-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes:
        mfd: lpc_ich: Fix Wildcat Point info name field
        mfd: ti-ssp: Fix build
        mfd: Make MFD_AS3722 depend on I2C=y
      32ac4869
    • Linus Torvalds's avatar
      Merge tag 'pm-3.13-rc3-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 77bd2adb
      Linus Torvalds authored
      Pull power management fixup from Rafael Wysocki:
       "This reverts two cpufreq commits that fixed issues for some people,
        but broke things for others, so revert them and we'll need to fix the
        original problems differently"
      
      * tag 'pm-3.13-rc3-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        Revert "cpufreq: fix garbage kobjects on errors during suspend/resume"
        Revert "cpufreq: suspend governors on system suspend/hibernate"
      77bd2adb
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 754ac457
      Linus Torvalds authored
      Pull input updates from Dmitry Torokhov:
       "An update to ALPS to support devices on Dell XT2 (hopefully working
        better this time around and although it is largish it should not
        affect any other ALPS devices) and a tiny update to Elantech driver to
        support newer devices as well.
      
        Also a coupe of new input event codes have been defined"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: ALPS - add support for DualPoint device on Dell XT2 model
        Input: elantech - add support for newer (August 2013) devices
        Input: add SW_MUTE_DEVICE switch definition
        Input: usbtouchscreen - separate report and transmit buffer size handling
        Input: sur40 - suppress false uninitialized variable warning
        Input: add key code for ambient light sensor button
        Input: keyboard - "keycode & KEY_MAX" changes some keycode values
      754ac457
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · b6db4eb0
      Linus Torvalds authored
      Pull crypto fix from Herbert Xu:
       "Unfortunately the last push that fixed a crash in the crypto
        scatterwalk code introduced a new crash when SG debugging is enabled.
        This fixes that"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: scatterwalk - Use sg_chain_ptr on chain entries
      b6db4eb0
    • Tom Lendacky's avatar
      crypto: scatterwalk - Use sg_chain_ptr on chain entries · 389a5390
      Tom Lendacky authored
      Now that scatterwalk_sg_chain sets the chain pointer bit the sg_page
      call in scatterwalk_sg_next hits a BUG_ON when CONFIG_DEBUG_SG is
      enabled. Use sg_chain_ptr instead of sg_page on a chain entry.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      389a5390
    • Linus Torvalds's avatar
      Merge tag 'tty-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 3f02ff5c
      Linus Torvalds authored
      Pull tty fix from Greg KH:
       "Here is a single n_tty fix for 3.13-rc3 that resolves a regression in
        3.12 that has been reported"
      
      * tag 'tty-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        n_tty: Fix missing newline echo
      3f02ff5c
    • Linus Torvalds's avatar
      Merge tag 'staging-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 2d4d4a8d
      Linus Torvalds authored
      Pull staging driver fixes from Greg KH:
       "Here are some bugfixes for the staging and IIO drivers for 3.13-rc3.
      
        The resolve the vm memory issue in the tidspbridge driver, fix a
        much-reported build failure in an ARM driver, and some other IIO
        bugfixes that have been reported"
      
      * tag 'staging-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        Staging: TIDSPBRIDGE: Use vm_iomap_memory for mmap-ing instead of remap_pfn_range
        Fix build failure for gp2ap020a00f.c
        iio: hid-sensors: Fix power and report state
        HID: hid-sensor-hub: Add logical min and max
      2d4d4a8d
    • Linus Torvalds's avatar
      Merge tag 'char-misc-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · f64001ef
      Linus Torvalds authored
      Pull char/misc driver fixes from Greg KH:
       "Nothing huge, just a few small bugfixes for problems reported, and a
        device id update"
      
      * tag 'char-misc-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        mei: add 9 series PCH mei device ids
        drivers/char/i8k.c: add Dell XPLS L421X
        MAINTAINERS: add HSI subsystem
        misc: mic: Suppress memory space sparse warnings
        misc: mic: Fix endianness issues.
        misc: mic: Fix user space namespace pollution from mic_common.h.
        misc: mic: Bug fix for sysfs poll usage.
        misc: mic: Minor bug fix in 'retry' loops.
        misc: mic: Change mic_notify(...) to return true.
        extcon: remove freed groups caused the panic or warning in unregister flow
        extcon: arizona: Get pdata from arizona structure not device
      f64001ef
    • Linus Torvalds's avatar
      Merge tag 'usb-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · b19d69c7
      Linus Torvalds authored
      Pull USB fixes from Greg KH:
       "Here are a bunch of USB fixes for 3.13-rc3.
      
        Nothing major, but we seem to have an argument about a XHCI fix, so
        I'm not including a revert that Sarah requested, because that breaks a
        USB network driver, and I can't revert the USB network driver fix
        without reintroducing other bugs that it fixed.  So as it is,
        everything should now be working.  Worse case, I can revert the XHCI
        fix before 3.13-final is out, but it seems to work well here with my
        testing, so all should be good.
      
        Other than that, some driver updates based on reports"
      
      * tag 'usb-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (40 commits)
        usb: hub: Use correct reset for wedged USB3 devices that are NOTATTACHED
        usb: ohci-pxa27x: include linux/dma-mapping.h
        USB: cdc-acm: Added support for the Lenovo RD02-D400 USB Modem
        usb: tools: fix a regression issue that gcc can't link to pthread
        USB: switch maintainership of chipidea to Peter
        USB: pl2303: fixed handling of CS5 setting
        USB: ftdi_sio: fixed handling of unsupported CSIZE setting
        USB: mos7840: correct handling of CS5 setting
        USB: spcp8x5: correct handling of CS5 setting
        usb: wusbcore: fix deadlock in wusbhc_gtk_rekey
        usb: wusbcore: do device lookup while holding the hc mutex
        usb: wusbcore: send keepalives to unauthenticated devices
        USB: option: support new huawei devices
        USB: serial: option: blacklist interface 1 for Huawei E173s-6
        usb: xhci: Link TRB must not occur within a USB payload burst
        usb: gadget: f_mass_storage: call try_to_freeze only when its safe
        usb: gadget: tcm_usb_gadget: mark bot_cleanup_old_alt static
        usb: gadget: ffs: fix sparse warning
        usb: gadget: zero: module parameters can be static
        usb: gadget: storage: fix sparse warning
        ...
      b19d69c7
    • Linus Torvalds's avatar
      Merge tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 · 7d49efe2
      Linus Torvalds authored
      Pull ARM64 fixes from Catalin Marinas:
       - Page table fixes (PROT_NONE, shareability attribute, TLB
         invalidation)
       - Secondary CPUs entry endianness fix
       - Make NR_CPUS default to 8
      
      * tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
        arm64: mm: Fix PMD_SECT_PROT_NONE definition
        arm64: Fix memory shareability attribute for ioremap_wc/cache
        arm64: kernel: add code to set cpu boot mode to secondary_entry shim
        arm64: make default NR_CPUS 8
        arm64: ensure completion of TLB invalidatation
      7d49efe2
  4. 08 Dec, 2013 2 commits