1. 18 Dec, 2015 20 commits
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus-v4.4-rc6' of... · 65d70e79
      Linus Torvalds authored
      Merge tag 'hwmon-for-linus-v4.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull hwmon fixes from Guenter Roeck:
      
       - Select CONFIG_BITREVERSE for sht15 driver to avoid build failure if
         it is not configured.
      
       - Force wait for conversion time for the first valid data in tmp102
         driver to avoid reporting erroneous data to the thermal subsystem.
      
      * tag 'hwmon-for-linus-v4.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (sht15) Select CONFIG_BITREVERSE
        hwmon: (tmp102) Force wait for conversion time for the first valid data
      65d70e79
    • Linus Torvalds's avatar
      Merge tag 'iommu-fixes-v4.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · ccdd96be
      Linus Torvalds authored
      Pull IOMMU fixes from Joerg Roedel:
       "Two similar fixes for the Intel and AMD IOMMU drivers to add proper
        access checks before calling handle_mm_fault"
      
      * tag 'iommu-fixes-v4.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
        iommu/vt-d: Do access checks before calling handle_mm_fault()
        iommu/amd: Do proper access checking before calling handle_mm_fault()
      ccdd96be
    • Linus Torvalds's avatar
      Merge tag 'for-linus-4.4-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 3273cba1
      Linus Torvalds authored
      Pull xen bug fixes from David Vrabel:
       - XSA-155 security fixes to backend drivers.
       - XSA-157 security fixes to pciback.
      
      * tag 'for-linus-4.4-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        xen-pciback: fix up cleanup path when alloc fails
        xen/pciback: Don't allow MSI-X ops if PCI_COMMAND_MEMORY is not set.
        xen/pciback: For XEN_PCI_OP_disable_msi[|x] only disable if device has MSI(X) enabled.
        xen/pciback: Do not install an IRQ handler for MSI interrupts.
        xen/pciback: Return error on XEN_PCI_OP_enable_msix when device has MSI or MSI-X enabled
        xen/pciback: Return error on XEN_PCI_OP_enable_msi when device has MSI or MSI-X enabled
        xen/pciback: Save xen_pci_op commands before processing it
        xen-scsiback: safely copy requests
        xen-blkback: read from indirect descriptors only once
        xen-blkback: only read request operation from shared ring once
        xen-netback: use RING_COPY_REQUEST() throughout
        xen-netback: don't use last request to determine minimum Tx credit
        xen: Add RING_COPY_REQUEST()
        xen/x86/pvh: Use HVM's flush_tlb_others op
        xen: Resume PMU from non-atomic context
        xen/events/fifo: Consume unprocessed events when a CPU dies
      3273cba1
    • Linus Torvalds's avatar
      Merge tag 'arc-fixes-for-4.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc · 83ad283f
      Linus Torvalds authored
      Pull ARC architecture fixes from Vineet Gupta:
       "Fixes for:
      
       - perf interrupts on SMP: Not enabled (at boot) and disabled (at runtime)
       - stack unwinder regression (for modules, ignoring dwarf3)
       - nsim hosed for non default kernel link base builds"
      
      * tag 'arc-fixes-for-4.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
        ARC: smp: Rename platform hook @init_cpu_smp -> @init_per_cpu
        ARC: rename smp operation init_irq_cpu() to init_per_cpu()
        ARC: dw2 unwind: Ignore CIE version !=1 gracefully instead of bailing
        ARC: dw2 unwind: Reinstante unwinding out of modules
        ARC: [plat-sim] unbork non default CONFIG_LINUX_LINK_BASE
        ARC: intc: Document arc_request_percpu_irq() better
        ARCv2: perf: Ensure perf intr gets enabled on all cores
        ARC: intc: No need to clear IRQ_NOAUTOEN
        ARCv2: intc: Fix random perf irq disabling in SMP setup
        ARC: [axs10x] cap ethernet phy to 100 Mbit/sec
      83ad283f
    • Linus Torvalds's avatar
      Merge tag 'sound-4.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 7b612255
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "As usual in rc6, this update contains only a few HD-audio and
        USB-audio device-specific quirks: yet another Thinkpad noise fixes,
        Dell headphone mic fixes, and AudioQuest DragonFly fixes"
      
      * tag 'sound-4.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - Add a fixup for Thinkpad X1 Carbon 2nd
        ALSA: hda - Set codec to D3 at reboot/shutdown on Thinkpads
        ALSA: hda - Apply click noise workaround for Thinkpads generically
        ALSA: hda - Fix headphone mic input on a few Dell ALC293 machines
        ALSA: usb-audio: Add sample rate inquiry quirk for AudioQuest DragonFly
        ALSA: usb-audio: Add a more accurate volume quirk for AudioQuest DragonFly
      7b612255
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20151217' of git://git.infradead.org/linux-mtd · 19c52240
      Linus Torvalds authored
      Pull MTD fixes from Brian Norris:
       "I was holding out on this pull request for a bit, since there are a
        few other small issues being discussed that look like 4.4-rc
        regressions.  Hopefully I can get those stabilized soon, but these are
        ready at any rate:
      
         - A little bit of a last-minute change for the device tree "fixed
           partition" binding.  This is needed because we might want to reuse
           the 'partitions' subnode for other sorts of partitioning
           descriptions -- e.g., for describing which on-flash partition
           format(s) might be used on the system.
      
         - Also tone down a warning message, since it is probably going to
           show up on a lot of systems where it should just be ignored"
      
      * tag 'for-linus-20151217' of git://git.infradead.org/linux-mtd:
        doc: dt: mtd: partitions: add compatible property to "partitions" node
        mtd: ofpart: don't complain about missing 'partitions' node too loudly
      19c52240
    • Doug Goldstein's avatar
      xen-pciback: fix up cleanup path when alloc fails · 584a561a
      Doug Goldstein authored
      When allocating a pciback device fails, clear the private
      field. This could lead to an use-after free, however
      the 'really_probe' takes care of setting
      dev_set_drvdata(dev, NULL) in its failure path (which we would
      exercise if the ->probe function failed), so we we
      are OK. However lets be defensive as the code can change.
      
      Going forward we should clean up the pci_set_drvdata(dev, NULL)
      in the various code-base. That will be for another day.
      Reviewed-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
      Reported-by: default avatarJonathan Creekmore <jonathan.creekmore@gmail.com>
      Signed-off-by: default avatarDoug Goldstein <cardoe@cardoe.com>
      Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      584a561a
    • Arnd Bergmann's avatar
      hwmon: (sht15) Select CONFIG_BITREVERSE · a3a316cf
      Arnd Bergmann authored
      If CONFIG_BITREVERSE is not built-in, the sht15 driver fails to link:
      
      drivers/built-in.o: In function `sht15_crc8':
      drivers/hwmon/sht15.c:195: undefined reference to `byte_rev_table'
      
      This adds a Kconfig 'select' statement, like all other users of
      bitrev.h have it.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Fixes: 33836ee9 ("hwmon:change sht15_reverse()")
      Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
      a3a316cf
    • Konrad Rzeszutek Wilk's avatar
      xen/pciback: Don't allow MSI-X ops if PCI_COMMAND_MEMORY is not set. · 408fb0e5
      Konrad Rzeszutek Wilk authored
      commit f598282f ("PCI: Fix the NIU MSI-X problem in a better way")
      teaches us that dealing with MSI-X can be troublesome.
      
      Further checks in the MSI-X architecture shows that if the
      PCI_COMMAND_MEMORY bit is turned of in the PCI_COMMAND we
      may not be able to access the BAR (since they are memory regions).
      
      Since the MSI-X tables are located in there.. that can lead
      to us causing PCIe errors. Inhibit us performing any
      operation on the MSI-X unless the MEMORY bit is set.
      
      Note that Xen hypervisor with:
      "x86/MSI-X: access MSI-X table only after having enabled MSI-X"
      will return:
      xen_pciback: 0000:0a:00.1: error -6 enabling MSI-X for guest 3!
      
      When the generic MSI code tries to setup the PIRQ without
      MEMORY bit set. Which means with later versions of Xen
      (4.6) this patch is not neccessary.
      
      This is part of XSA-157
      
      CC: stable@vger.kernel.org
      Reviewed-by: default avatarJan Beulich <jbeulich@suse.com>
      Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      408fb0e5
    • Konrad Rzeszutek Wilk's avatar
      xen/pciback: For XEN_PCI_OP_disable_msi[|x] only disable if device has MSI(X) enabled. · 7cfb905b
      Konrad Rzeszutek Wilk authored
      Otherwise just continue on, returning the same values as
      previously (return of 0, and op->result has the PIRQ value).
      
      This does not change the behavior of XEN_PCI_OP_disable_msi[|x].
      
      The pci_disable_msi or pci_disable_msix have the checks for
      msi_enabled or msix_enabled so they will error out immediately.
      
      However the guest can still call these operations and cause
      us to disable the 'ack_intr'. That means the backend IRQ handler
      for the legacy interrupt will not respond to interrupts anymore.
      
      This will lead to (if the device is causing an interrupt storm)
      for the Linux generic code to disable the interrupt line.
      
      Naturally this will only happen if the device in question
      is plugged in on the motherboard on shared level interrupt GSI.
      
      This is part of XSA-157
      
      CC: stable@vger.kernel.org
      Reviewed-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
      Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      7cfb905b
    • Konrad Rzeszutek Wilk's avatar
      xen/pciback: Do not install an IRQ handler for MSI interrupts. · a396f3a2
      Konrad Rzeszutek Wilk authored
      Otherwise an guest can subvert the generic MSI code to trigger
      an BUG_ON condition during MSI interrupt freeing:
      
       for (i = 0; i < entry->nvec_used; i++)
              BUG_ON(irq_has_action(entry->irq + i));
      
      Xen PCI backed installs an IRQ handler (request_irq) for
      the dev->irq whenever the guest writes PCI_COMMAND_MEMORY
      (or PCI_COMMAND_IO) to the PCI_COMMAND register. This is
      done in case the device has legacy interrupts the GSI line
      is shared by the backend devices.
      
      To subvert the backend the guest needs to make the backend
      to change the dev->irq from the GSI to the MSI interrupt line,
      make the backend allocate an interrupt handler, and then command
      the backend to free the MSI interrupt and hit the BUG_ON.
      
      Since the backend only calls 'request_irq' when the guest
      writes to the PCI_COMMAND register the guest needs to call
      XEN_PCI_OP_enable_msi before any other operation. This will
      cause the generic MSI code to setup an MSI entry and
      populate dev->irq with the new PIRQ value.
      
      Then the guest can write to PCI_COMMAND PCI_COMMAND_MEMORY
      and cause the backend to setup an IRQ handler for dev->irq
      (which instead of the GSI value has the MSI pirq). See
      'xen_pcibk_control_isr'.
      
      Then the guest disables the MSI: XEN_PCI_OP_disable_msi
      which ends up triggering the BUG_ON condition in 'free_msi_irqs'
      as there is an IRQ handler for the entry->irq (dev->irq).
      
      Note that this cannot be done using MSI-X as the generic
      code does not over-write dev->irq with the MSI-X PIRQ values.
      
      The patch inhibits setting up the IRQ handler if MSI or
      MSI-X (for symmetry reasons) code had been called successfully.
      
      P.S.
      Xen PCIBack when it sets up the device for the guest consumption
      ends up writting 0 to the PCI_COMMAND (see xen_pcibk_reset_device).
      XSA-120 addendum patch removed that - however when upstreaming said
      addendum we found that it caused issues with qemu upstream. That
      has now been fixed in qemu upstream.
      
      This is part of XSA-157
      
      CC: stable@vger.kernel.org
      Reviewed-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
      Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      a396f3a2
    • Konrad Rzeszutek Wilk's avatar
      xen/pciback: Return error on XEN_PCI_OP_enable_msix when device has MSI or MSI-X enabled · 5e0ce145
      Konrad Rzeszutek Wilk authored
      The guest sequence of:
      
        a) XEN_PCI_OP_enable_msix
        b) XEN_PCI_OP_enable_msix
      
      results in hitting an NULL pointer due to using freed pointers.
      
      The device passed in the guest MUST have MSI-X capability.
      
      The a) constructs and SysFS representation of MSI and MSI groups.
      The b) adds a second set of them but adding in to SysFS fails (duplicate entry).
      'populate_msi_sysfs' frees the newly allocated msi_irq_groups (note that
      in a) pdev->msi_irq_groups is still set) and also free's ALL of the
      MSI-X entries of the device (the ones allocated in step a) and b)).
      
      The unwind code: 'free_msi_irqs' deletes all the entries and tries to
      delete the pdev->msi_irq_groups (which hasn't been set to NULL).
      However the pointers in the SysFS are already freed and we hit an
      NULL pointer further on when 'strlen' is attempted on a freed pointer.
      
      The patch adds a simple check in the XEN_PCI_OP_enable_msix to guard
      against that. The check for msi_enabled is not stricly neccessary.
      
      This is part of XSA-157
      
      CC: stable@vger.kernel.org
      Reviewed-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
      Reviewed-by: default avatarJan Beulich <jbeulich@suse.com>
      Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      5e0ce145
    • Konrad Rzeszutek Wilk's avatar
      xen/pciback: Return error on XEN_PCI_OP_enable_msi when device has MSI or MSI-X enabled · 56441f3c
      Konrad Rzeszutek Wilk authored
      The guest sequence of:
      
       a) XEN_PCI_OP_enable_msi
       b) XEN_PCI_OP_enable_msi
       c) XEN_PCI_OP_disable_msi
      
      results in hitting an BUG_ON condition in the msi.c code.
      
      The MSI code uses an dev->msi_list to which it adds MSI entries.
      Under the above conditions an BUG_ON() can be hit. The device
      passed in the guest MUST have MSI capability.
      
      The a) adds the entry to the dev->msi_list and sets msi_enabled.
      The b) adds a second entry but adding in to SysFS fails (duplicate entry)
      and deletes all of the entries from msi_list and returns (with msi_enabled
      is still set).  c) pci_disable_msi passes the msi_enabled checks and hits:
      
      BUG_ON(list_empty(dev_to_msi_list(&dev->dev)));
      
      and blows up.
      
      The patch adds a simple check in the XEN_PCI_OP_enable_msi to guard
      against that. The check for msix_enabled is not stricly neccessary.
      
      This is part of XSA-157.
      
      CC: stable@vger.kernel.org
      Reviewed-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
      Reviewed-by: default avatarJan Beulich <jbeulich@suse.com>
      Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      56441f3c
    • Konrad Rzeszutek Wilk's avatar
      xen/pciback: Save xen_pci_op commands before processing it · 8135cf8b
      Konrad Rzeszutek Wilk authored
      Double fetch vulnerabilities that happen when a variable is
      fetched twice from shared memory but a security check is only
      performed the first time.
      
      The xen_pcibk_do_op function performs a switch statements on the op->cmd
      value which is stored in shared memory. Interestingly this can result
      in a double fetch vulnerability depending on the performed compiler
      optimization.
      
      This patch fixes it by saving the xen_pci_op command before
      processing it. We also use 'barrier' to make sure that the
      compiler does not perform any optimization.
      
      This is part of XSA155.
      
      CC: stable@vger.kernel.org
      Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      Signed-off-by: default avatarJan Beulich <JBeulich@suse.com>
      Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
      Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      8135cf8b
    • David Vrabel's avatar
      xen-scsiback: safely copy requests · be69746e
      David Vrabel authored
      The copy of the ring request was lacking a following barrier(),
      potentially allowing the compiler to optimize the copy away.
      
      Use RING_COPY_REQUEST() to ensure the request is copied to local
      memory.
      
      This is part of XSA155.
      
      CC: stable@vger.kernel.org
      Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
      Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
      Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      be69746e
    • Roger Pau Monné's avatar
      xen-blkback: read from indirect descriptors only once · 18779149
      Roger Pau Monné authored
      Since indirect descriptors are in memory shared with the frontend, the
      frontend could alter the first_sect and last_sect values after they have
      been validated but before they are recorded in the request.  This may
      result in I/O requests that overflow the foreign page, possibly
      overwriting local pages when the I/O request is executed.
      
      When parsing indirect descriptors, only read first_sect and last_sect
      once.
      
      This is part of XSA155.
      
      CC: stable@vger.kernel.org
      Signed-off-by: default avatarRoger Pau Monné <roger.pau@citrix.com>
      Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
      Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      18779149
    • Roger Pau Monné's avatar
      xen-blkback: only read request operation from shared ring once · 1f13d75c
      Roger Pau Monné authored
      A compiler may load a switch statement value multiple times, which could
      be bad when the value is in memory shared with the frontend.
      
      When converting a non-native request to a native one, ensure that
      src->operation is only loaded once by using READ_ONCE().
      
      This is part of XSA155.
      
      CC: stable@vger.kernel.org
      Signed-off-by: default avatarRoger Pau Monné <roger.pau@citrix.com>
      Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
      Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      1f13d75c
    • David Vrabel's avatar
      xen-netback: use RING_COPY_REQUEST() throughout · 68a33bfd
      David Vrabel authored
      Instead of open-coding memcpy()s and directly accessing Tx and Rx
      requests, use the new RING_COPY_REQUEST() that ensures the local copy
      is correct.
      
      This is more than is strictly necessary for guest Rx requests since
      only the id and gref fields are used and it is harmless if the
      frontend modifies these.
      
      This is part of XSA155.
      
      CC: stable@vger.kernel.org
      Reviewed-by: default avatarWei Liu <wei.liu2@citrix.com>
      Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
      Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      68a33bfd
    • David Vrabel's avatar
      xen-netback: don't use last request to determine minimum Tx credit · 0f589967
      David Vrabel authored
      The last from guest transmitted request gives no indication about the
      minimum amount of credit that the guest might need to send a packet
      since the last packet might have been a small one.
      
      Instead allow for the worst case 128 KiB packet.
      
      This is part of XSA155.
      
      CC: stable@vger.kernel.org
      Reviewed-by: default avatarWei Liu <wei.liu2@citrix.com>
      Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
      Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      0f589967
    • David Vrabel's avatar
      xen: Add RING_COPY_REQUEST() · 454d5d88
      David Vrabel authored
      Using RING_GET_REQUEST() on a shared ring is easy to use incorrectly
      (i.e., by not considering that the other end may alter the data in the
      shared ring while it is being inspected).  Safe usage of a request
      generally requires taking a local copy.
      
      Provide a RING_COPY_REQUEST() macro to use instead of
      RING_GET_REQUEST() and an open-coded memcpy().  This takes care of
      ensuring that the copy is done correctly regardless of any possible
      compiler optimizations.
      
      Use a volatile source to prevent the compiler from reordering or
      omitting the copy.
      
      This is part of XSA155.
      
      CC: stable@vger.kernel.org
      Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
      Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      454d5d88
  2. 17 Dec, 2015 14 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 73796d8b
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Fix uninitialized variable warnings in nfnetlink_queue, a lot of
          people reported this...  From Arnd Bergmann.
      
       2) Don't init mutex twice in i40e driver, from Jesse Brandeburg.
      
       3) Fix spurious EBUSY in rhashtable, from Herbert Xu.
      
       4) Missing DMA unmaps in mvpp2 driver, from Marcin Wojtas.
      
       5) Fix race with work structure access in pppoe driver causing
          corruptions, from Guillaume Nault.
      
       6) Fix OOPS due to sh_eth_rx() not checking whether netdev_alloc_skb()
          actually succeeded or not, from Sergei Shtylyov.
      
       7) Don't lose flags when settifn IFA_F_OPTIMISTIC in ipv6 code, from
          Bjørn Mork.
      
       8) VXLAN_HD_RCO defined incorrectly, fix from Jiri Benc.
      
       9) Fix clock source used for cookies in SCTP, from Marcelo Ricardo
          Leitner.
      
      10) aurora driver needs HAS_DMA dependency, from Geert Uytterhoeven.
      
      11) ndo_fill_metadata_dst op of vxlan has to handle ipv6 tunneling
          properly as well, from Jiri Benc.
      
      12) Handle request sockets properly in xfrm layer, from Eric Dumazet.
      
      13) Double stats update in ipv6 geneve transmit path, fix from Pravin B
          Shelar.
      
      14) sk->sk_policy[] needs RCU protection, and as a result
          xfrm_policy_destroy() needs to free policies using an RCU grace
          period, from Eric Dumazet.
      
      15) SCTP needs to clone ipv6 tx options in order to avoid use after
          free, from Eric Dumazet.
      
      16) Missing kbuild export if ila.h, from Stephen Hemminger.
      
      17) Missing mdiobus_alloc() return value checking in mdio-mux.c, from
          Tobias Klauser.
      
      18) Validate protocol value range in ->create() methods, from Hannes
          Frederic Sowa.
      
      19) Fix early socket demux races that result in illegal dst reuse, from
          Eric Dumazet.
      
      20) Validate socket address length in pptp code, from WANG Cong.
      
      21) skb_reorder_vlan_header() uses incorrect offset and can corrupt
          packets, from Vlad Yasevich.
      
      22) Fix memory leaks in nl80211 registry code, from Ola Olsson.
      
      23) Timeout loop count handing fixes in mISDN, xgbe, qlge, sfc, and
          qlcnic.  From Dan Carpenter.
      
      24) msg.msg_iocb needs to be cleared in recvfrom() otherwise, for
          example, AF_ALG will interpret it as an async call.  From Tadeusz
          Struk.
      
      25) inetpeer_set_addr_v4 forgets to initialize the 'vif' field, from
          Eric Dumazet.
      
      26) rhashtable enforces the minimum table size not early enough,
          breaking how we calculate the per-cpu lock allocations.  From
          Herbert Xu.
      
      27) Fix FCC port lockup in 82xx driver, from Martin Roth.
      
      28) FOU sockets need to be freed using RCU, from Hannes Frederic Sowa.
      
      29) Fix out-of-bounds access in __skb_complete_tx_timestamp() and
          sock_setsockopt() wrt.  timestamp handling.  From WANG Cong.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (117 commits)
        net: check both type and procotol for tcp sockets
        drivers: net: xgene: fix Tx flow control
        tcp: restore fastopen with no data in SYN packet
        af_unix: Revert 'lock_interruptible' in stream receive code
        fou: clean up socket with kfree_rcu
        82xx: FCC: Fixing a bug causing to FCC port lock-up
        gianfar: Don't enable RX Filer if not supported
        net: fix warnings in 'make htmldocs' by moving macro definition out of field declaration
        rhashtable: Fix walker list corruption
        rhashtable: Enforce minimum size on initial hash table
        inet: tcp: fix inetpeer_set_addr_v4()
        ipv6: automatically enable stable privacy mode if stable_secret set
        net: fix uninitialized variable issue
        bluetooth: Validate socket address length in sco_sock_bind().
        net_sched: make qdisc_tree_decrease_qlen() work for non mq
        ser_gigaset: remove unnecessary kfree() calls from release method
        ser_gigaset: fix deallocation of platform device structure
        ser_gigaset: turn nonsense checks into WARN_ON
        ser_gigaset: fix up NULL checks
        qlcnic: fix a timeout loop
        ...
      73796d8b
    • WANG Cong's avatar
      net: check both type and procotol for tcp sockets · ac5cc977
      WANG Cong authored
      Dmitry reported the following out-of-bound access:
      
      Call Trace:
       [<ffffffff816cec2e>] __asan_report_load4_noabort+0x3e/0x40
      mm/kasan/report.c:294
       [<ffffffff84affb14>] sock_setsockopt+0x1284/0x13d0 net/core/sock.c:880
       [<     inline     >] SYSC_setsockopt net/socket.c:1746
       [<ffffffff84aed7ee>] SyS_setsockopt+0x1fe/0x240 net/socket.c:1729
       [<ffffffff85c18c76>] entry_SYSCALL_64_fastpath+0x16/0x7a
      arch/x86/entry/entry_64.S:185
      
      This is because we mistake a raw socket as a tcp socket.
      We should check both sk->sk_type and sk->sk_protocol to ensure
      it is a tcp socket.
      
      Willem points out __skb_complete_tx_timestamp() needs to fix as well.
      Reported-by: default avatarDmitry Vyukov <dvyukov@google.com>
      Cc: Willem de Bruijn <willemdebruijn.kernel@gmail.com>
      Cc: Eric Dumazet <eric.dumazet@gmail.com>
      Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
      Acked-by: default avatarWillem de Bruijn <willemb@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ac5cc977
    • Iyappan Subramanian's avatar
      drivers: net: xgene: fix Tx flow control · 67894eec
      Iyappan Subramanian authored
      Currently the Tx flow control is based on reading the hardware state,
      which is not accurate since it may not reflect the descriptors that
      are not yet reached the memory.
      
      To accurately control the Tx flow, changing it to be software based.
      Signed-off-by: default avatarIyappan Subramanian <isubramanian@apm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      67894eec
    • Eric Dumazet's avatar
      tcp: restore fastopen with no data in SYN packet · 07e100f9
      Eric Dumazet authored
      Yuchung tracked a regression caused by commit 57be5bda ("ip: convert
      tcp_sendmsg() to iov_iter primitives") for TCP Fast Open.
      
      Some Fast Open users do not actually add any data in the SYN packet.
      
      Fixes: 57be5bda ("ip: convert tcp_sendmsg() to iov_iter primitives")
      Reported-by: default avatarYuchung Cheng <ycheng@google.com>
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Acked-by: default avatarYuchung Cheng <ycheng@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      07e100f9
    • Rainer Weikusat's avatar
      af_unix: Revert 'lock_interruptible' in stream receive code · 3822b5c2
      Rainer Weikusat authored
      With b3ca9b02, the AF_UNIX SOCK_STREAM
      receive code was changed from using mutex_lock(&u->readlock) to
      mutex_lock_interruptible(&u->readlock) to prevent signals from being
      delayed for an indefinite time if a thread sleeping on the mutex
      happened to be selected for handling the signal. But this was never a
      problem with the stream receive code (as opposed to its datagram
      counterpart) as that never went to sleep waiting for new messages with the
      mutex held and thus, wouldn't cause secondary readers to block on the
      mutex waiting for the sleeping primary reader. As the interruptible
      locking makes the code more complicated in exchange for no benefit,
      change it back to using mutex_lock.
      Signed-off-by: default avatarRainer Weikusat <rweikusat@mobileactivedefense.com>
      Acked-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3822b5c2
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · ce42af94
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Some i915 fixes, one omap fix, one core regression fix.
      
        Not even enough fixes for a twelve days of xmas song, which seemms
        good"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm: Don't overwrite UNVERFIED mode status to OK
        drm/omap: fix fbdev pix format to support all platforms
        drm/i915: Do a better job at disabling primary plane in the noatomic case.
        drm/i915/skl: Double RC6 WRL always on
        drm/i915/skl: Disable coarse power gating up until F0
        drm/i915: Remove incorrect warning in context cleanup
      ce42af94
    • Will Deacon's avatar
      locking/osq: Fix ordering of node initialisation in osq_lock · b4b29f94
      Will Deacon authored
      The Cavium guys reported a soft lockup on their arm64 machine, caused by
      commit c55a6ffa ("locking/osq: Relax atomic semantics"):
      
          mutex_optimistic_spin+0x9c/0x1d0
          __mutex_lock_slowpath+0x44/0x158
          mutex_lock+0x54/0x58
          kernfs_iop_permission+0x38/0x70
          __inode_permission+0x88/0xd8
          inode_permission+0x30/0x6c
          link_path_walk+0x68/0x4d4
          path_openat+0xb4/0x2bc
          do_filp_open+0x74/0xd0
          do_sys_open+0x14c/0x228
          SyS_openat+0x3c/0x48
          el0_svc_naked+0x24/0x28
      
      This is because in osq_lock we initialise the node for the current CPU:
      
          node->locked = 0;
          node->next = NULL;
          node->cpu = curr;
      
      and then publish the current CPU in the lock tail:
      
          old = atomic_xchg_acquire(&lock->tail, curr);
      
      Once the update to lock->tail is visible to another CPU, the node is
      then live and can be both read and updated by concurrent lockers.
      
      Unfortunately, the ACQUIRE semantics of the xchg operation mean that
      there is no guarantee the contents of the node will be visible before
      lock tail is updated.  This can lead to lock corruption when, for
      example, a concurrent locker races to set the next field.
      
      Fixes: c55a6ffa ("locking/osq: Relax atomic semantics"):
      Reported-by: default avatarDavid Daney <ddaney@caviumnetworks.com>
      Reported-by: default avatarAndrew Pinski <andrew.pinski@caviumnetworks.com>
      Tested-by: default avatarAndrew Pinski <andrew.pinski@caviumnetworks.com>
      Acked-by: default avatarDavidlohr Bueso <dave@stgolabs.net>
      Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
      Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
      Link: http://lkml.kernel.org/r/1449856001-21177-1-git-send-email-will.deacon@arm.comSigned-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b4b29f94
    • Linus Torvalds's avatar
      Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm · d7637d01
      Linus Torvalds authored
      Pull libnvdimm fixes from Dan Williams:
      
       - Two bug fixes for misuse of PAGE_MASK in scatterlist and dma-debug.
         These are tagged for -stable.  The scatterlist impact is potentially
        corrupted dma addresses on HIGHMEM enabled platforms.
      
       - A minor locking fix for the NFIT hot-add implementation that is new
         in 4.4-rc.  This would only trigger in the case a hot-add raced
         driver removal.
      
      * 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
        dma-debug: Fix dma_debug_entry offset calculation
        Revert "scatterlist: use sg_phys()"
        nfit: acpi_nfit_notify(): Do not leave device locked
      d7637d01
    • Vineet Gupta's avatar
      ARC: smp: Rename platform hook @init_cpu_smp -> @init_per_cpu · 575a9d4e
      Vineet Gupta authored
      Makes it similar to smp_ops which also has callback with same name
      Signed-off-by: default avatarVineet Gupta <vgupta@synopsys.com>
      575a9d4e
    • Noam Camus's avatar
      ARC: rename smp operation init_irq_cpu() to init_per_cpu() · b474a023
      Noam Camus authored
      This will better reflect its description i.e. "any needed setup..."
      and not just do an "IPI request".
      Signed-off-by: default avatarNoam Camus <noamc@ezchip.com>
      Acked-by: default avatarVineet Gupta <vgupta@synopsys.com>
      Signed-off-by: default avatarVineet Gupta <vgupta@synopsys.com>
      b474a023
    • Vineet Gupta's avatar
      ARC: dw2 unwind: Ignore CIE version !=1 gracefully instead of bailing · 323f41f9
      Vineet Gupta authored
      ARC dwarf unwinder only supports CIE version == 1
      The boot time dwarf sanitizer (part of binary lookup table constructor)
      would simply bail if it saw CIE version == 3, rendering unwinder with a
      NULL lookup table.
      
      It seems libgcc linked with kernel does have such entries.
      
      With fallback linear search removed, and a NULL binary lookup table,
      unwinder fails to generate any stack trace.
      
      So allow graceful ignoring of unsupported CIE entries.
      
      This problem was initially seen in Alexey's setup (and not mine) as he
      was using buildroot built toolchain (libgcc) which doesn't get built with
      CFLAGS_FOR_TARGET="-gdwarf-2 which is my default
      
      Fixes STAR 9000985048: "kernel unwinder broken with stock tools"
      
      Fixes: 2e22502c ARC: dw2 unwind: Remove falllback linear search thru FDE entries
      Reported-by Alexey Brodkin <abrodkin@synopsys.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarVineet Gupta <vgupta@synopsys.com>
      323f41f9
    • Vineet Gupta's avatar
      ARC: dw2 unwind: Reinstante unwinding out of modules · bc79c9a7
      Vineet Gupta authored
      The fix which removed linear searching of dwarf (because binary lookup
      data always exists) missed out on the fact that modules don't get the
      binary lookup tables info. This caused unwinding out of modules to stop
      working.
      
      So add binary lookup header setup (equivalent of eh_frame_hdr setup) to
      modules as well.
      
      While at it, confine the header setup to within unwinder code,
      reducing one API exposed out of unwinder code.
      
      Fixes: 2e22502c ARC: dw2 unwind: Remove falllback linear search thru FDE entries
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarVineet Gupta <vgupta@synopsys.com>
      bc79c9a7
    • Vineet Gupta's avatar
      ARC: [plat-sim] unbork non default CONFIG_LINUX_LINK_BASE · ff1c0b6a
      Vineet Gupta authored
      HIGHMEM support bumped the default memory size for nsim platform to 1G.
      Thus total memory ended at the very edge of start of peripherals address
      space. With linux link base shifted, memory started bleeding into
      peripheral space which caused early boot bad_page spew !
      
      Fixes: 29e33226 ("ARC: mm: HIGHMEM: populate high memory from DT")
      Reported-by: default avatarAnton Kolesov <akolesov@synopsys.com>
      Signed-off-by: default avatarVineet Gupta <vgupta@synopsys.com>
      ff1c0b6a
    • Hannes Frederic Sowa's avatar
      fou: clean up socket with kfree_rcu · 3036facb
      Hannes Frederic Sowa authored
      fou->udp_offloads is managed by RCU. As it is actually included inside
      the fou sockets, we cannot let the memory go out of scope before a grace
      period. We either can synchronize_rcu or switch over to kfree_rcu to
      manage the sockets. kfree_rcu seems appropriate as it is used by vxlan
      and geneve.
      
      Fixes: 23461551 ("fou: Support for foo-over-udp RX path")
      Cc: Tom Herbert <tom@herbertland.com>
      Signed-off-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3036facb
  3. 16 Dec, 2015 6 commits