1. 17 Jul, 2016 29 commits
  2. 16 Jul, 2016 1 commit
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20160715' of git://git.infradead.org/linux-mtd · 47ef4ad2
      Linus Torvalds authored
      Pull MTD fix from Brian Norris:
       "Late MTD fix for v4.7:
      
        One regression in the Device Tree handling for OMAP NAND handling of
        the ELM node.  TI migrated to using the property name "ti,elm-id", but
        forgot to keep compatibility with the old "elm_id" property.
      
        Also, might as well send out this MAINTAINERS fixup now"
      
      * tag 'for-linus-20160715' of git://git.infradead.org/linux-mtd:
        mtd: nand: omap2: Add check for old elm binding
        MAINTAINERS: Add file patterns for mtd device tree bindings
      47ef4ad2
  3. 15 Jul, 2016 10 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 63151703
      Linus Torvalds authored
      Pull input fixes from Dmitry Torokhov:
       "A few last-minute updates for the input subsystem"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: ts4800-ts - add missing of_node_put after calling of_parse_phandle
        Input: synaptics-rmi4 - use of_get_child_by_name() to fix refcount
        Revert "Input: wacom_w8001 - drop use of ABS_MT_TOOL_TYPE"
        Input: xpad - validate USB endpoint count during probe
        Input: add SW_PEN_INSERTED define
      63151703
    • Linus Torvalds's avatar
      Merge branch 'for-4.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · 8dcf5a80
      Linus Torvalds authored
      Pull workqueue fix from Tejun Heo:
       "The optimization for setting unbound worker affinity masks collided
        with recent scheduler changes triggering warning messages.
      
        This late pull request fixes the bug by removing the optimization"
      
      * 'for-4.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        workqueue: Fix setting affinity of unbound worker threads
      8dcf5a80
    • Jann Horn's avatar
      xfs: fix type confusion in xfs_ioc_swapext · 3e0a3965
      Jann Horn authored
      Without this check, the following XFS_I invocations would return bad
      pointers when used on non-XFS inodes (perhaps pointers into preceding
      allocator chunks).
      
      This could be used by an attacker to trick xfs_swap_extents into
      performing locking operations on attacker-chosen structures in kernel
      memory, potentially leading to code execution in the kernel.  (I have
      not investigated how likely this is to be usable for an attack in
      practice.)
      Signed-off-by: default avatarJann Horn <jann@thejh.net>
      Cc: Andy Lutomirski <luto@amacapital.net>
      Cc: Dave Chinner <david@fromorbit.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      3e0a3965
    • James Patrick-Evans's avatar
      media: fix airspy usb probe error path · aa93d1fe
      James Patrick-Evans authored
      Fix a memory leak on probe error of the airspy usb device driver.
      
      The problem is triggered when more than 64 usb devices register with
      v4l2 of type VFL_TYPE_SDR or VFL_TYPE_SUBDEV.
      
      The memory leak is caused by the probe function of the airspy driver
      mishandeling errors and not freeing the corresponding control structures
      when an error occours registering the device to v4l2 core.
      
      A badusb device can emulate 64 of these devices, and then through
      continual emulated connect/disconnect of the 65th device, cause the
      kernel to run out of RAM and crash the kernel, thus causing a local DOS
      vulnerability.
      
      Fixes CVE-2016-5400
      Signed-off-by: default avatarJames Patrick-Evans <james@jmp-e.com>
      Reviewed-by: default avatarKees Cook <keescook@chromium.org>
      Cc: stable@vger.kernel.org # 3.17+
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      aa93d1fe
    • Tony Luck's avatar
      EDAC, sb_edac: Fix Knights Landing · 0ba169ac
      Tony Luck authored
      In commit 2c1ea4c7 ("EDAC, sb_edac: Use cpu family/model in driver
      detection") I broke Knights Landing because I failed to notice that it
      called a wrapper macro "sbridge_get_all_devices_knl" instead of
      "sbridge_get_all_devices" like all the other types.
      
      Now that we include the processor type in the pci_id_table structure we
      can skip the wrappers and just have the sbridge_get_all_devices() check
      the type to decide whether to allow duplicate devices and controllers to
      have registers spread across buses.
      
      Fixes: 2c1ea4c7 ("EDAC, sb_edac: Use cpu family/model in driver detection")
      Tested-by: default avatarLukasz Odzioba <lukasz.odzioba@intel.com>
      Acked-by: default avatarAristeu Rozanski <aris@redhat.com>
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      0ba169ac
    • Peter Chen's avatar
      Input: ts4800-ts - add missing of_node_put after calling of_parse_phandle · 6a5029e6
      Peter Chen authored
      of_node_put needs to be called when the device node which is got
      from of_parse_phandle has finished using.
      Signed-off-by: default avatarPeter Chen <peter.chen@nxp.com>
      Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
      6a5029e6
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew) · fa3a9f57
      Linus Torvalds authored
      Merge misc fixes from Andrew Morton:
       "20 fixes"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>:
        m32r: fix build warning about putc
        mm: workingset: printk missing log level, use pr_info()
        mm: thp: refix false positive BUG in page_move_anon_rmap()
        mm: rmap: call page_check_address() with sync enabled to avoid racy check
        mm: thp: move pmd check inside ptl for freeze_page()
        vmlinux.lds: account for destructor sections
        gcov: add support for gcc version >= 6
        mm, meminit: ensure node is online before checking whether pages are uninitialised
        mm, meminit: always return a valid node from early_pfn_to_nid
        kasan/quarantine: fix bugs on qlist_move_cache()
        uapi: export lirc.h header
        madvise_free, thp: fix madvise_free_huge_pmd return value after splitting
        Revert "scripts/gdb: add documentation example for radix tree"
        Revert "scripts/gdb: add a Radix Tree Parser"
        scripts/gdb: Perform path expansion to lx-symbol's arguments
        scripts/gdb: add constants.py to .gitignore
        scripts/gdb: rebuild constants.py on dependancy change
        scripts/gdb: silence 'nothing to do' message
        kasan: add newline to messages
        mm, compaction: prevent VM_BUG_ON when terminating freeing scanner
      fa3a9f57
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma · 0a9cb481
      Linus Torvalds authored
      Pull rdma fixes from Doug Ledford:
       "Round three of 4.7 rc fixes:
         - two fixes for hfi1
         - two fixes for i40iw
         - one omission correction in the port table counter arrays"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
        i40iw: Enable remote access rights for stag allocation
        i40iw: do not print unitialized variables in error message
        IB core: Add port_xmit_wait counter
        IB/hfi1: Fix sleep inside atomic issue in init_asic_data
        IB/hfi1: Correct issues with sc5 computation
      0a9cb481
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 1a86f944
      Linus Torvalds authored
      Pull i2c fixes from Wolfram Sang:
       "Four driver bugfixes for the I2C subsystem"
      
      * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        i2c: mux: reg: wrong condition checked for of_address_to_resource return value
        i2c: tegra: Correct error path in probe
        i2c: remove __init from i2c_register_board_info()
        i2c: qup: Fix wrong value of index variable
      1a86f944
    • Linus Torvalds's avatar
      Merge tag 'drm-fixes-for-v4.7-rc8-vmware' of git://people.freedesktop.org/~airlied/linux · 1f027f69
      Linus Torvalds authored
      Pull drm vmware fixes from Dave Airlie:
       "These are some fixes for the vmware graphics driver, that fix some
        black screen issues on at least Ubuntu 16.04, I think VMware would
        like to get these in so stable can pick them up ASAP"
      
      * tag 'drm-fixes-for-v4.7-rc8-vmware' of git://people.freedesktop.org/~airlied/linux:
        drm/vmwgfx: Fix error paths when mapping framebuffer
        drm/vmwgfx: Fix corner case screen target management
        drm/vmwgfx: Delay pinning fbdev framebuffer until after mode set
        drm/vmwgfx: Check pin count before attempting to move a buffer
        drm/ttm: Make ttm_bo_mem_compat available
        drm/vmwgfx: Add an option to change assumed FB bpp
        drm/vmwgfx: Work around mode set failure in 2D VMs
        drm/vmwgfx: Add a check to handle host message failure
      1f027f69