1. 13 Sep, 2014 5 commits
    • Linus Torvalds's avatar
      Make hash_64() use a 64-bit multiply when appropriate · 23d0db76
      Linus Torvalds authored
      The hash_64() function historically does the multiply by the
      GOLDEN_RATIO_PRIME_64 number with explicit shifts and adds, because
      unlike the 32-bit case, gcc seems unable to turn the constant multiply
      into the more appropriate shift and adds when required.
      
      However, that means that we generate those shifts and adds even when the
      architecture has a fast multiplier, and could just do it better in
      hardware.
      
      Use the now-cleaned-up CONFIG_ARCH_HAS_FAST_MULTIPLIER (together with
      "is it a 64-bit architecture") to decide whether to use an integer
      multiply or the explicit sequence of shift/add instructions.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      23d0db76
    • Linus Torvalds's avatar
      Make ARCH_HAS_FAST_MULTIPLIER a real config variable · 72d93104
      Linus Torvalds authored
      It used to be an ad-hoc hack defined by the x86 version of
      <asm/bitops.h> that enabled a couple of library routines to know whether
      an integer multiply is faster than repeated shifts and additions.
      
      This just makes it use the real Kconfig system instead, and makes x86
      (which was the only architecture that did this) select the option.
      
      NOTE! Even for x86, this really is kind of wrong.  If we cared, we would
      probably not enable this for builds optimized for netburst (P4), where
      shifts-and-adds are generally faster than multiplies.  This patch does
      *not* change that kind of logic, though, it is purely a syntactic change
      with no code changes.
      
      This was triggered by the fact that we have other places that really
      want to know "do I want to expand multiples by constants by hand or
      not", particularly the hash generation code.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      72d93104
    • Linus Torvalds's avatar
      Merge tag 'dm-3.17-fix2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · 186cec31
      Linus Torvalds authored
      Pull device mapper fix from Mike Snitzer:
       "Fix a race in the DM cache target that caused dirty blocks to be
        marked as clean.  This could cause no writeback to occur or spurious
        dirty block counts"
      
      * tag 'dm-3.17-fix2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm cache: fix race causing dirty blocks to be marked as clean
      186cec31
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 645cc093
      Linus Torvalds authored
      Pull block fixes from Jens Axboe:
       "A small collection of fixes for the current rc series.  This contains:
      
         - Two small blk-mq patches from Rob Elliott, cleaning up error case
           at init time.
      
         - A fix from Ming Lei, fixing SG merging for blk-mq where
           QUEUE_FLAG_SG_NO_MERGE is the default.
      
         - A dev_t minor lifetime fix from Keith, fixing an issue where a
           minor might be reused before all references to it were gone.
      
         - Fix from Alan Stern where an unbalanced queue bypass caused SCSI
           some headaches when it does a series of add/del on devices without
           fully registrering the queue.
      
         - A fix from me for improving the scaling of tag depth in blk-mq if
           we are short on memory"
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        blk-mq: scale depth and rq map appropriate if low on memory
        Block: fix unbalanced bypass-disable in blk_register_queue
        block: Fix dev_t minor allocation lifetime
        blk-mq: cleanup after blk_mq_init_rq_map failures
        blk-mq: pass along blk_mq_alloc_tag_set return values
        blk-merge: fix blk_recount_segments
      645cc093
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.17-b-rc4-arm-tag' of... · fc486b03
      Linus Torvalds authored
      Merge tag 'stable/for-linus-3.17-b-rc4-arm-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
      
      Pull Xen ARM bugfix from Stefano Stabellini:
       "The patches fix the "xen_add_mach_to_phys_entry: cannot add" bug that
        has been affecting xen on arm and arm64 guests since 3.16.  They
        require a few hypervisor side changes that just went in xen-unstable.
      
        A couple of days ago David sent out a pull request with a few other
        Xen fixes (it is already in master).  Sorry we didn't synchronized
        better among us"
      
      * tag 'stable/for-linus-3.17-b-rc4-arm-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        xen/arm: remove mach_to_phys rbtree
        xen/arm: reimplement xen_dma_unmap_page & friends
        xen/arm: introduce XENFEAT_grant_map_identity
      fc486b03
  2. 12 Sep, 2014 16 commits
    • Linus Torvalds's avatar
      Merge tag 'char-misc-3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 471cff7c
      Linus Torvalds authored
      Pull char/misc driver fix from Greg KH:
       "Here is one misc driver fix for 3.17-rc5.  It resolves a kernel oops
        that can happen in the lattice FPGA driver if the firmware isn't
        present on the system.
      
        It's been in the linux-next tree for a while now"
      
      * tag 'char-misc-3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        Lattice ECP3 FPGA: Check firmware pointer
      471cff7c
    • Linus Torvalds's avatar
      Merge tag 'staging-3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · a6988b33
      Linus Torvalds authored
      Pull staging driver fixes from Greg KH:
       "Here are 3 tiny staging driver fixes for 3.17-rc5.
      
        Two are fixes for the imx-drm driver, resolving issues that have been
        reported.  The other is a memory leak fix for the Android sync driver,
        due to changes that went into 3.17-rc1.
      
        All have been in linux-next for a while"
      
      * tag 'staging-3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        android: fix reference leak in sync_fence_create
        imx-drm: imx-ldb: fix NULL pointer in imx_ldb_unbind()
        imx-drm: ipuv3-plane: fix ipu_plane_dpms()
      a6988b33
    • Linus Torvalds's avatar
      Merge tag 'tty-3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 09db9d63
      Linus Torvalds authored
      Pull tty/serial fixes from Greg KH:
       "Here are 3 patches for 3.17-rc5.  Two serial driver fixes that resolve
        some reported issues, and one new device id.
      
        All have been in linux-next just fine"
      
      * tag 'tty-3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        tty: xuartps: Fix tx_emtpy() callback
        tty/serial: at91: BUG: disable interrupts when !UART_ENABLE_MS()
        serial: 8250_dw: Add ACPI ID for Intel Braswell
      09db9d63
    • Linus Torvalds's avatar
      Merge tag 'usb-3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 90a3c48f
      Linus Torvalds authored
      Pull USB fixes from Greg KH:
       "Here are some USB and PHY fixes for 3.17-rc5.
      
        Nothing major here, just a number of tiny fixes for reported issues,
        and some new device ids as well.
      
        All have been tested in linux-next"
      
      * tag 'usb-3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (46 commits)
        xhci: fix oops when xhci resumes from hibernate with hw lpm capable devices
        usb: xhci: Fix OOPS in xhci error handling code
        xhci: Fix null pointer dereference if xhci initialization fails
        storage: Add single-LUN quirk for Jaz USB Adapter
        uas: Add missing le16_to_cpu calls to asm1051 / asm1053 usb-id check
        usb: chipidea: msm: Initialize PHY on reset event
        usb: chipidea: msm: Use USB PHY API to control PHY state
        usb: hub: take hub->hdev reference when processing from eventlist
        uas: Disable uas on ASM1051 devices
        usb: dwc2/gadget: avoid disabling ep0
        usb: dwc2/gadget: delay enabling irq once hardware is configured properly
        usb: dwc2/gadget: do not call disconnect method in pullup
        usb: dwc2/gadget: break infinite loop in endpoint disable code
        usb: dwc2/gadget: fix phy initialization sequence
        usb: dwc2/gadget: fix phy disable sequence
        uwb: init beacon cache entry before registering uwb device
        USB: ftdi_sio: Add support for GE Healthcare Nemo Tracker device
        USB: document the 'u' flag for usb-storage quirks parameter
        usb: host: xhci: fix compliance mode workaround
        usb: dwc3: fix TRB completion when multiple TRBs are started
        ...
      90a3c48f
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-3.17-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 602b5366
      Linus Torvalds authored
      Pull NFS client fixes from Trond Myklebust:
       "Highlights:
         - fix a kernel warning when removing /proc/net/nfsfs
         - revert commit 49a4bda2 due to Oopses
         - fix a typo in the pNFS file layout commit code"
      
      * tag 'nfs-for-3.17-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        pnfs: fix filelayout_retry_commit when idx > 0
        nfs: revert "nfs4: queue free_lock_state job submission to nfsiod"
        nfs: fix kernel warning when removing proc entry
      602b5366
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 7ed641be
      Linus Torvalds authored
      Pull btrfs fixes from Chris Mason:
       "Filipe is doing a careful pass through fsync problems, and these are
        the fixes so far.  I'll have one more for rc6 that we're still
        testing.
      
        My big commit is fixing up some inode hash races that Al Viro found
        (thanks Al)"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: use insert_inode_locked4 for inode creation
        Btrfs: fix fsync data loss after a ranged fsync
        Btrfs: kfree()ing ERR_PTRs
        Btrfs: fix crash while doing a ranged fsync
        Btrfs: fix corruption after write/fsync failure + fsync + log recovery
        Btrfs: fix autodefrag with compression
      7ed641be
    • Linus Torvalds's avatar
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 9925cc13
      Linus Torvalds authored
      Pull arm64 fixes from Will Deacon:
       "Just a couple of stragglers here:
      
         - fix an issue migrating interrupts on CPU hotplug
         - fix a potential information leak of TLS registers across an exec
           (Nathan has sent a corresponding patch for arch/arm/ to rmk)"
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64: flush TLS registers during exec
        arm64: use irq_set_affinity with force=false when migrating irqs
      9925cc13
    • Linus Torvalds's avatar
      Merge tag 'iommu-fixes-v3.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 753a6cb7
      Linus Torvalds authored
      Pull iommu fixes from Joerg Roedel:
       - two fixes for issues found by Coverity
       - various fixes for the ARM SMMU driver
       - a warning fix for the FSL PAMU driver
      
      * tag 'iommu-fixes-v3.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
        iommu/fsl: Fix warning resulting from adding PCI device twice
        iommu/arm-smmu: fix corner cases in address size calculations
        iommu/arm-smmu: fix decimal printf format specifiers prefixed with 0x
        iommu/arm-smmu: Do not access non-existing S2CR registers
        iommu/arm-smmu: fix s2cr and smr teardown on device detach from domain
        iommu/arm-smmu: remove pgtable_page_{c,d}tor()
        iommu/arm-smmu: fix programming of SMMU_CBn_TCR for stage 1
        iommu/arm-smmu: avoid calling request_irq in atomic context
        iommu/vt-d: Check return value of acpi_bus_get_device()
        iommu/core: Make iommu_group_get_for_dev() more robust
      753a6cb7
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 96ea975b
      Linus Torvalds authored
      Pull assoc array garbage collection fix from James Morris.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        KEYS: Fix termination condition in assoc array garbage collection
      96ea975b
    • Linus Torvalds's avatar
      Merge tag 'fbdev-fixes-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux · 5874cfed
      Linus Torvalds authored
      Pull fbdev fixes from Tomi Valkeinen:
       "Minor fixes for amba-clcd and video DT bindings"
      
      * tag 'fbdev-fixes-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
        video: ARM CLCD: Fix color model capabilities for DT platforms
        video: fix composite video connector compatible string
      5874cfed
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 850ebc0c
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "AST, i915, radeon and msm fixes, all over the place.
      
        All fixing build issues, regressions, oopses or failure to detect
        cards"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/ast: AST2000 cannot be detected correctly
        drm/ast: open key before detect chips
        drm/msm: don't crash if no msm.vram param
        drm/msm/hdmi: fix build break on non-CCF platforms
        drm/msm: Change nested function to static function
        drm/radeon/dpm: set the thermal type properly for special configs
        drm/radeon: reduce memory footprint for debugging
        drm/radeon: add connector quirk for fujitsu board
        drm/radeon: fix semaphore value init
        drm/radeon: only use me/pfp sync on evergreen+
        drm/i915: Wait for vblank before enabling the TV encoder
        drm/i915: Evict CS TLBs between batches
        drm/i915: Fix irq enable tracking in driver load
        drm/i915: Fix EIO/wedged handling in gem fault handler
        drm/i915: Prevent recursive deadlock on releasing a busy userptr
      850ebc0c
    • David Howells's avatar
      KEYS: Fix termination condition in assoc array garbage collection · 95389b08
      David Howells authored
      This fixes CVE-2014-3631.
      
      It is possible for an associative array to end up with a shortcut node at the
      root of the tree if there are more than fan-out leaves in the tree, but they
      all crowd into the same slot in the lowest level (ie. they all have the same
      first nibble of their index keys).
      
      When assoc_array_gc() returns back up the tree after scanning some leaves, it
      can fall off of the root and crash because it assumes that the back pointer
      from a shortcut (after label ascend_old_tree) must point to a normal node -
      which isn't true of a shortcut node at the root.
      
      Should we find we're ascending rootwards over a shortcut, we should check to
      see if the backpointer is zero - and if it is, we have completed the scan.
      
      This particular bug cannot occur if the root node is not a shortcut - ie. if
      you have fewer than 17 keys in a keyring or if you have at least two keys that
      sit into separate slots (eg. a keyring and a non keyring).
      
      This can be reproduced by:
      
      	ring=`keyctl newring bar @s`
      	for ((i=1; i<=18; i++)); do last_key=`keyctl newring foo$i $ring`; done
      	keyctl timeout $last_key 2
      
      Doing this:
      
      	echo 3 >/proc/sys/kernel/keys/gc_delay
      
      first will speed things up.
      
      If we do fall off of the top of the tree, we get the following oops:
      
      BUG: unable to handle kernel NULL pointer dereference at 0000000000000018
      IP: [<ffffffff8136cea7>] assoc_array_gc+0x2f7/0x540
      PGD dae15067 PUD cfc24067 PMD 0
      Oops: 0000 [#1] SMP
      Modules linked in: xt_nat xt_mark nf_conntrack_netbios_ns nf_conntrack_broadcast ip6t_rpfilter ip6t_REJECT xt_conntrack ebtable_nat ebtable_broute bridge stp llc ebtable_filter ebtables ip6table_ni
      CPU: 0 PID: 26011 Comm: kworker/0:1 Not tainted 3.14.9-200.fc20.x86_64 #1
      Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011
      Workqueue: events key_garbage_collector
      task: ffff8800918bd580 ti: ffff8800aac14000 task.ti: ffff8800aac14000
      RIP: 0010:[<ffffffff8136cea7>] [<ffffffff8136cea7>] assoc_array_gc+0x2f7/0x540
      RSP: 0018:ffff8800aac15d40  EFLAGS: 00010206
      RAX: 0000000000000000 RBX: 0000000000000000 RCX: ffff8800aaecacc0
      RDX: ffff8800daecf440 RSI: 0000000000000001 RDI: ffff8800aadc2bc0
      RBP: ffff8800aac15da8 R08: 0000000000000001 R09: 0000000000000003
      R10: ffffffff8136ccc7 R11: 0000000000000000 R12: 0000000000000000
      R13: 0000000000000000 R14: 0000000000000070 R15: 0000000000000001
      FS:  0000000000000000(0000) GS:ffff88011fc00000(0000) knlGS:0000000000000000
      CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
      CR2: 0000000000000018 CR3: 00000000db10d000 CR4: 00000000000006f0
      Stack:
       ffff8800aac15d50 0000000000000011 ffff8800aac15db8 ffffffff812e2a70
       ffff880091a00600 0000000000000000 ffff8800aadc2bc3 00000000cd42c987
       ffff88003702df20 ffff88003702dfa0 0000000053b65c09 ffff8800aac15fd8
      Call Trace:
       [<ffffffff812e2a70>] ? keyring_detect_cycle_iterator+0x30/0x30
       [<ffffffff812e3e75>] keyring_gc+0x75/0x80
       [<ffffffff812e1424>] key_garbage_collector+0x154/0x3c0
       [<ffffffff810a67b6>] process_one_work+0x176/0x430
       [<ffffffff810a744b>] worker_thread+0x11b/0x3a0
       [<ffffffff810a7330>] ? rescuer_thread+0x3b0/0x3b0
       [<ffffffff810ae1a8>] kthread+0xd8/0xf0
       [<ffffffff810ae0d0>] ? insert_kthread_work+0x40/0x40
       [<ffffffff816ffb7c>] ret_from_fork+0x7c/0xb0
       [<ffffffff810ae0d0>] ? insert_kthread_work+0x40/0x40
      Code: 08 4c 8b 22 0f 84 bf 00 00 00 41 83 c7 01 49 83 e4 fc 41 83 ff 0f 4c 89 65 c0 0f 8f 5a fe ff ff 48 8b 45 c0 4d 63 cf 49 83 c1 02 <4e> 8b 34 c8 4d 85 f6 0f 84 be 00 00 00 41 f6 c6 01 0f 84 92
      RIP  [<ffffffff8136cea7>] assoc_array_gc+0x2f7/0x540
       RSP <ffff8800aac15d40>
      CR2: 0000000000000018
      ---[ end trace 1129028a088c0cbd ]---
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Acked-by: default avatarDon Zickus <dzickus@redhat.com>
      Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
      95389b08
    • Pawel Moll's avatar
      video: ARM CLCD: Fix color model capabilities for DT platforms · e4cf39ea
      Pawel Moll authored
      The DT-based panel capabilities selection was picking up
      a subset of available modes based on hardware configuration.
      This was wrong, as the capabilities describe available
      memory models and adapt the display controller to them
      that the RGB output is wired up correctly (as in: R and
      B components are not swapped).
      
      This patch fixes it by removing the unnecessary limitation.
      Signed-off-by: default avatarPawel Moll <pawel.moll@arm.com>
      Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
      e4cf39ea
    • Y.C. Chen's avatar
      drm/ast: AST2000 cannot be detected correctly · 83502a5d
      Y.C. Chen authored
      Type error and cause AST2000 cannot be detected correctly
      Signed-off-by: default avatarY.C. Chen <yc_chen@aspeedtech.com>
      Reviewed-by: default avatarEgbert Eich <eich@suse.de>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      83502a5d
    • Y.C. Chen's avatar
      drm/ast: open key before detect chips · 8f372e25
      Y.C. Chen authored
      Some config settings like 3rd TX chips will not get correctly
      if the extended reg is protected
      Signed-off-by: default avatarY.C. Chen <yc_chen@aspeedtech.com>
      Reviewed-by: default avatarEgbert Eich <eich@suse.de>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      8f372e25
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · c73f6fdf
      Linus Torvalds authored
      Pull Ceph fixes from Sage Weil:
       "The main thing here is a set of three patches that fix a buffer
        overrun for large authentication tickets (sigh).
      
        There is also a trivial warning fix and an error path fix that are
        both regressions"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
        libceph: do not hard code max auth ticket len
        libceph: add process_one_ticket() helper
        libceph: gracefully handle large reply messages from the mon
        rbd: fix error return code in rbd_dev_device_setup()
        rbd: avoid format-security warning inside alloc_workqueue()
      c73f6fdf
  3. 11 Sep, 2014 19 commits