Permalink
Switch branches/tags
Commits on Jun 15, 2017
  1. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

    Pull networking fixes from David Miller:
    
     1) The netlink attribute passed in to dev_set_alias() is not
        necessarily NULL terminated, don't use strlcpy() on it. From
        Alexander Potapenko.
    
     2) Fix implementation of atomics in arm64 bpf JIT, from Daniel
        Borkmann.
    
     3) Correct the release of netdevs and driver private data in certain
        circumstances.
    
     4) Sanitize netlink message length properly in decnet, from Mateusz
        Jurczyk.
    
     5) Don't leak kernel data in rtnl_fill_vfinfo() netlink blobs. From
        Yuval Mintz.
    
     6) Hash secret is never initialized in ipv6 ILA translation code, from
        Arnd Bergmann. I guess those clang warnings about unused inline
        functions are useful for something!
    
     7) Fix endian selection in bpf_endian.h, from Daniel Borkmann.
    
     8) Sanitize sockaddr length before dereferncing any fields in AF_UNIX
        and CAIF. From Mateusz Jurczyk.
    
     9) Fix timestamping for GMAC3 chips in stmmac driver, from Mario
        Molitor.
    
    10) Do not leak netdev on dev_alloc_name() errors in mac80211, from
        Johannes Berg.
    
    11) Fix locking in sctp_for_each_endpoint(), from Xin Long.
    
    12) Fix wrong memset size on 32-bit in snmp6, from Christian Perle.
    
    13) Fix use after free in ip_mc_clear_src(), from WANG Cong.
    
    14) Fix regressions caused by ICMP rate limiting changes in 4.11, from
        Jesper Dangaard Brouer.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (91 commits)
      i40e: Fix a sleep-in-atomic bug
      net: don't global ICMP rate limit packets originating from loopback
      net/act_pedit: fix an error code
      net: update undefined ->ndo_change_mtu() comment
      net_sched: move tcf_lock down after gen_replace_estimator()
      caif: Add sockaddr length check before accessing sa_family in connect handler
      qed: fix dump of context data
      qmi_wwan: new Telewell and Sierra device IDs
      net: phy: Fix MDIO_THUNDER dependencies
      netconsole: Remove duplicate "netconsole: " logging prefix
      igmp: acquire pmc lock for ip_mc_clear_src()
      r8152: give the device version
      net: rps: fix uninitialized symbol warning
      mac80211: don't send SMPS action frame in AP mode when not needed
      mac80211/wpa: use constant time memory comparison for MACs
      mac80211: set bss_info data before configuring the channel
      mac80211: remove 5/10 MHz rate code from station MLME
      mac80211: Fix incorrect condition when checking rx timestamp
      mac80211: don't look at the PM bit of BAR frames
      i40e: fix handling of HW ATR eviction
      ...
    torvalds committed Jun 15, 2017
  2. Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git…

    …/herbert/crypto-2.6
    
    Pull crypto fix from Herbert Xu:
     "This fixes a bug on sparc where we may dereference freed stack memory"
    
    * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
      crypto: Work around deallocated stack frame reference gcc bug on sparc.
    torvalds committed Jun 15, 2017
  3. Merge tag 'acpi-4.12-rc6' of git://git.kernel.org/pub/scm/linux/kerne…

    …l/git/rafael/linux-pm
    
    Pull ACPI fixes from Rafael Wysocki:
     "These revert an ACPICA commit from the 4.11 cycle that causes problems
      to happen on some systems and add a protection against possible kernel
      crashes due to table reference counter imbalance.
    
      Specifics:
    
       - Revert a 4.11 ACPICA change that made assumptions which are not
         satisfied on some systems and caused the enumeration of resources
         to fail on them (Rafael Wysocki).
    
       - Add a mechanism to prevent tables from being unmapped prematurely
         due to reference counter overflows (Lv Zheng)"
    
    * tag 'acpi-4.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
      ACPICA: Tables: Mechanism to handle late stage acpi_get_table() imbalance
      Revert "ACPICA: Disassembler: Enhance resource descriptor detection"
    torvalds committed Jun 15, 2017
  4. Merge tag 'pm-4.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/…

    …git/rafael/linux-pm
    
    Pull power management fixes from Rafael Wysocki:
     "These revert a recent cpufreq schedutil governor change that turned
      out to be problematic and fix a few minor issues in cpufreq, cpuidle
      and the Exynos devfreq drivers.
    
      Specifics:
    
       - Revert a recent cpufreq schedutil governor change that caused some
         systems to behave undesirably (Rafael Wysocki).
    
       - Fix a cpufreq conservative governor issue introduced during the
         3.10 cycle that prevents it from working as expected in some
         situations (Tomasz Wilczyński).
    
       - Fix an error code path in the generic cpuidle driver for DT-based
         systems (Christophe Jaillet).
    
       - Fix three minor issues in devfreq drivers for Exynos (Arvind Yadav,
         Krzysztof Kozlowski)"
    
    * tag 'pm-4.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
      cpuidle: dt: Add missing 'of_node_put()'
      cpufreq: conservative: Allow down_threshold to take values from 1 to 10
      Revert "cpufreq: schedutil: Reduce frequencies slower"
      PM / devfreq: exynos-ppmu: Staticize event list
      PM / devfreq: exynos-ppmu: Handle return value of clk_prepare_enable
      PM / devfreq: exynos-nocp: Handle return value of clk_prepare_enable
    torvalds committed Jun 15, 2017
  5. Merge branch 'for-4.12/driver-matching-fix' of git://git.kernel.org/p…

    …ub/scm/linux/kernel/git/jikos/hid
    
    Pull HID fix from Jiri Kosina:
    
     - ifdef-based bandaid for a long-standing issue with HID driver
       matching, avoiding regressions in cases where specific driver is not
       enabled in kernel .config, from Jiri Kosina
    
    * 'for-4.12/driver-matching-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
      HID: let generic driver yield control iff specific driver has been enabled
    torvalds committed Jun 15, 2017
  6. Merge tag 'media/v4.12-3' of git://git.kernel.org/pub/scm/linux/kerne…

    …l/git/mchehab/linux-media
    
    Pull media fixes from Mauro Carvalho Chehab:
    
     - some build dependency issues at CEC core with randconfigs
    
     - fix an off by one error at vb2
    
     - a race fix at cec core
    
     - driver fixes at tc358743, sir_ir and rainshadow-cec
    
    * tag 'media/v4.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
      [media] media/cec.h: use IS_REACHABLE instead of IS_ENABLED
      [media] cec: race fix: don't return -ENONET in cec_receive()
      [media] sir_ir: infinite loop in interrupt handler
      [media] cec-notifier.h: handle unreachable CONFIG_CEC_CORE
      [media] cec: improve MEDIA_CEC_RC dependencies
      [media] vb2: Fix an off by one error in 'vb2_plane_vaddr'
      [media] rainshadow-cec: Fix missing spin_lock_init()
      [media] tc358743: fix register i2c_rd/wr function fix
    torvalds committed Jun 15, 2017
  7. i40e: Fix a sleep-in-atomic bug

    The driver may sleep under a spin lock, and the function call path is:
    i40e_ndo_set_vf_port_vlan (acquire the lock by spin_lock_bh)
      i40e_vsi_remove_pvid
        i40e_vlan_stripping_disable
          i40e_aq_update_vsi_params
            i40e_asq_send_command
              mutex_lock --> may sleep
    
    To fixed it, the spin lock is released before "i40e_vsi_remove_pvid", and
    the lock is acquired again after this function.
    
    Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com>
    Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    XidianGeneral committed with davem330 Jun 14, 2017
Commits on Jun 14, 2017
  1. Merge branch 'acpica-fixes'

    * acpica-fixes:
      ACPICA: Tables: Mechanism to handle late stage acpi_get_table() imbalance
      Revert "ACPICA: Disassembler: Enhance resource descriptor detection"
    Rafael J. Wysocki committed Jun 14, 2017
  2. Merge branches 'pm-cpufreq', 'pm-cpuidle' and 'pm-devfreq'

    * pm-cpufreq:
      cpufreq: conservative: Allow down_threshold to take values from 1 to 10
      Revert "cpufreq: schedutil: Reduce frequencies slower"
    
    * pm-cpuidle:
      cpuidle: dt: Add missing 'of_node_put()'
    
    * pm-devfreq:
      PM / devfreq: exynos-ppmu: Staticize event list
      PM / devfreq: exynos-ppmu: Handle return value of clk_prepare_enable
      PM / devfreq: exynos-nocp: Handle return value of clk_prepare_enable
    Rafael J. Wysocki committed Jun 14, 2017
  3. net: don't global ICMP rate limit packets originating from loopback

    Florian Weimer seems to have a glibc test-case which requires that
    loopback interfaces does not get ICMP ratelimited.  This was broken by
    commit c0303ef ("net: reduce cycles spend on ICMP replies that
    gets rate limited").
    
    An ICMP response will usually be routed back-out the same incoming
    interface.  Thus, take advantage of this and skip global ICMP
    ratelimit when the incoming device is loopback.  In the unlikely event
    that the outgoing it not loopback, due to strange routing policy
    rules, ICMP rate limiting still works via peer ratelimiting via
    icmpv4_xrlim_allow().  Thus, we should still comply with RFC1812
    (section 4.3.2.8 "Rate Limiting").
    
    This seems to fix the reproducer given by Florian.  While still
    avoiding to perform expensive and unneeded outgoing route lookup for
    rate limited packets (in the non-loopback case).
    
    Fixes: c0303ef ("net: reduce cycles spend on ICMP replies that gets rate limited")
    Reported-by: Florian Weimer <fweimer@redhat.com>
    Reported-by: "H.J. Lu" <hjl.tools@gmail.com>
    Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    netoptimizer committed with davem330 Jun 14, 2017
  4. net/act_pedit: fix an error code

    I'm reviewing static checker warnings where we do ERR_PTR(0), which is
    the same as NULL.  I'm pretty sure we intended to return ERR_PTR(-EINVAL)
    here.  Sometimes these bugs lead to a NULL dereference but I don't
    immediately see that problem here.
    
    Fixes: 71d0ed7 ("net/act_pedit: Support using offset relative to the conventional network headers")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Acked-by: Amir Vadai <amir@vadai.me>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Dan Carpenter committed with davem330 Jun 14, 2017
  5. net: update undefined ->ndo_change_mtu() comment

    Update ->ndo_change_mtu() callback comment to remove text
    about returning error in case of undefined callback. This
    change makes the comment match the existing code behavior.
    
    Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Magnus Damm committed with davem330 Jun 14, 2017
  6. net_sched: move tcf_lock down after gen_replace_estimator()

    Laura reported a sleep-in-atomic kernel warning inside
    tcf_act_police_init() which calls gen_replace_estimator() with
    spinlock protection.
    
    It is not necessary in this case, we already have RTNL lock here
    so it is enough to protect concurrent writers. For the reader,
    i.e. tcf_act_police(), it needs to make decision based on this
    rate estimator, in the worst case we drop more/less packets than
    necessary while changing the rate in parallel, it is still acceptable.
    
    Reported-by: Laura Abbott <labbott@redhat.com>
    Reported-by: Nick Huber <nicholashuber@gmail.com>
    Cc: Jamal Hadi Salim <jhs@mojatatu.com>
    Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
    Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    congwang committed with davem330 Jun 13, 2017
Commits on Jun 13, 2017
  1. caif: Add sockaddr length check before accessing sa_family in connect…

    … handler
    
    Verify that the caller-provided sockaddr structure is large enough to
    contain the sa_family field, before accessing it in the connect()
    handler of the AF_CAIF socket. Since the syscall doesn't enforce a minimum
    size of the corresponding memory region, very short sockaddrs (zero or one
    byte long) result in operating on uninitialized memory while referencing
    sa_family.
    
    Signed-off-by: Mateusz Jurczyk <mjurczyk@google.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    j00ru committed with davem330 Jun 13, 2017
  2. Merge tag 'batadv-net-for-davem-20170613' of git://git.open-mesh.org/…

    …linux-merge
    
    Simon Wunderlich says:
    
    ====================
    Here are two batman-adv bugfixes:
    
     - fix rx packet counters for local ARP replies, by Sven Eckelmann
    
     - fix memory leaks for unicast packetes received from another gateway
       in bridge loop avoidance, by Andreas Pape
    ====================
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
    davem330 committed Jun 13, 2017
  3. Merge tag 'mac80211-for-davem-2017-06-13' of git://git.kernel.org/pub…

    …/scm/linux/kernel/git/jberg/mac80211
    
    Johannes Berg says:
    
    ====================
    Some fixes:
     * Avi fixes some fallout from my mac80211 RX flags changes
     * Emmanuel fixes an issue with adhering to the spec, and
       an oversight in the SMPS management code
     * Jason's patch makes mac80211 use constant-time memory
       comparisons for message authentication, to avoid having
       potentially observable timing differences
     * my fix makes mac80211 set the basic rates bitmap before
       the channel so the next update to the driver has more
       consistent data - this required another rework patch to
       remove some useless 5/10 MHz code that can never be hit
    ====================
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
    davem330 committed Jun 13, 2017
  4. qed: fix dump of context data

    Currently when dumping a context data only word number '1' is read for the
    entire context.
    
    Fixes: c965db4 ("qed: Add support for debug data collection")
    
    Signed-off-by: Tomer Tayar <Tomer.Tayar@cavium.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Tayar, Tomer committed with davem330 Jun 13, 2017
  5. qmi_wwan: new Telewell and Sierra device IDs

    A new Sierra Wireless EM7305 device ID used in a Toshiba laptop,
    and two Longcheer device IDs entries used by Telewell TW-3G HSPA+
    branded modems.
    
    Reported-by: Petr Kloc <petr_kloc@yahoo.com>
    Reported-by: Teemu Likonen <tlikonen@iki.fi>
    Signed-off-by: Bjørn Mork <bjorn@mork.no>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    bmork committed with davem330 Jun 13, 2017
  6. net: phy: Fix MDIO_THUNDER dependencies

    After commit 90eff90 ("net: phy: Allow splitting MDIO
    bus/device support from PHYs") we could create a configuration where
    MDIO_DEVICE=y and PHYLIB=m which leads to the following undefined
    references:
    
     drivers/built-in.o: In function `thunder_mdiobus_pci_remove':
    >> mdio-thunder.c:(.text+0x2a212f): undefined reference to
    >> `mdiobus_unregister'
    >> mdio-thunder.c:(.text+0x2a2138): undefined reference to
    >> `mdiobus_free'
       drivers/built-in.o: In function `thunder_mdiobus_pci_probe':
       mdio-thunder.c:(.text+0x2a22e7): undefined reference to
    `devm_mdiobus_alloc_size'
       mdio-thunder.c:(.text+0x2a236f): undefined reference to
    `of_mdiobus_register'
    
    Reported-by: kbuild test robot <fengguang.wu@intel.com>
    Fixes: 90eff90 ("net: phy: Allow splitting MDIO bus/device support from PHYs")
    Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
    Tested-by: Randy Dunlap <rdunlap@infradead.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    ffainelli committed with davem330 Jun 13, 2017
  7. netconsole: Remove duplicate "netconsole: " logging prefix

    It's already added by pr_fmt so remove the explicit use.
    
    Signed-off-by: Joe Perches <joe@perches.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    JoePerches committed with davem330 Jun 12, 2017
  8. igmp: acquire pmc lock for ip_mc_clear_src()

    Andrey reported a use-after-free in add_grec():
    
            for (psf = *psf_list; psf; psf = psf_next) {
    		...
                    psf_next = psf->sf_next;
    
    where the struct ip_sf_list's were already freed by:
    
     kfree+0xe8/0x2b0 mm/slub.c:3882
     ip_mc_clear_src+0x69/0x1c0 net/ipv4/igmp.c:2078
     ip_mc_dec_group+0x19a/0x470 net/ipv4/igmp.c:1618
     ip_mc_drop_socket+0x145/0x230 net/ipv4/igmp.c:2609
     inet_release+0x4e/0x1c0 net/ipv4/af_inet.c:411
     sock_release+0x8d/0x1e0 net/socket.c:597
     sock_close+0x16/0x20 net/socket.c:1072
    
    This happens because we don't hold pmc->lock in ip_mc_clear_src()
    and a parallel mr_ifc_timer timer could jump in and access them.
    
    The RCU lock is there but it is merely for pmc itself, this
    spinlock could actually ensure we don't access them in parallel.
    
    Thanks to Eric and Long for discussion on this bug.
    
    Reported-by: Andrey Konovalov <andreyknvl@google.com>
    Cc: Eric Dumazet <edumazet@google.com>
    Cc: Xin Long <lucien.xin@gmail.com>
    Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
    Reviewed-by: Xin Long <lucien.xin@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    congwang committed with davem330 Jun 12, 2017
  9. r8152: give the device version

    Getting the device version out of the driver really aids debugging.
    
    Signed-off-by: Oliver Neukum <oneukum@suse.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    oneukum committed with davem330 Jun 12, 2017
  10. net: rps: fix uninitialized symbol warning

    This patch fixes uninitialized symbol warning that
    got introduced by the following commit
    773fc8f ("net: rps: send out pending IPI's on CPU hotplug")
    
    Signed-off-by: Ashwanth Goli <ashwanth@codeaurora.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Ashwanth Goli committed with davem330 Jun 13, 2017
  11. HID: let generic driver yield control iff specific driver has been en…

    …abled
    
    There are many situations where generic HID driver provides some basic level
    of support for certain device, but later this support (usually by implementing
    vendor-specific extensions of HID protocol) is extended and the support moved
    over to a separate (usually per-vendor) specific driver.
    
    This might bring a rather unpleasant suprise for users, as all of a sudden
    there is a new config option they have to enable in order to get any support
    for their device whatsoever, although previous kernel versions provided basic
    support through the generic driver. Which is rightfully seen as a regression.
    
    Fix this by including the entry for a particular device in
    hid_have_special_driver[] iff the specific config option has been specified,
    and let generic driver handle the device otherwise.
    Also make the behavior of hid_scan_report() (where the same decision is being
    taken on a per-report level) consistent.
    
    While at it, reshuffle the hid_have_special_driver[] a bit to restore the
    alphabetical ordering (first order by config option, and within those
    sections order by VID).
    
    This is considered a short-term solution, before generic way of giving
    precedence to special drivers and falling back to generic driver is
    figured out.
    
    While at it, fixup a missing entry for GFRM driver; thanks to Hans de Geode for
    spotting this (and for discovering a few issues in the conversion).
    
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    Jiri Kosina committed Jun 9, 2017
  12. mac80211: don't send SMPS action frame in AP mode when not needed

    mac80211 allows to modify the SMPS state of an AP both,
    when it is started, and after it has been started. Such a
    change will trigger an action frame to all the peers that
    are currently connected, and will be remembered so that
    new peers will get notified as soon as they connect (since
    the SMPS setting in the beacon may not be the right one).
    
    This means that we need to remember the SMPS state
    currently requested as well as the SMPS state that was
    configured initially (and advertised in the beacon).
    The former is bss->req_smps and the latter is
    sdata->smps_mode.
    
    Initially, the AP interface could only be started with
    SMPS_OFF, which means that sdata->smps_mode was SMPS_OFF
    always. Later, a nl80211 API was added to be able to start
    an AP with a different AP mode. That code forgot to update
    bss->req_smps and because of that, if the AP interface was
    started with SMPS_DYNAMIC, we had:
       sdata->smps_mode = SMPS_DYNAMIC
       bss->req_smps = SMPS_OFF
    
    That configuration made mac80211 think it needs to fire off
    an action frame to any new station connecting to the AP in
    order to let it know that the actual SMPS configuration is
    SMPS_OFF.
    
    Fix that by properly setting bss->req_smps in
    ieee80211_start_ap.
    
    Fixes: f699317 ("mac80211: set smps_mode according to ap params")
    Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
    Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Emmanuel Grumbach committed with jmberg Jun 10, 2017
  13. mac80211/wpa: use constant time memory comparison for MACs

    Otherwise, we enable all sorts of forgeries via timing attack.
    
    Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
    Cc: Johannes Berg <johannes@sipsolutions.net>
    Cc: linux-wireless@vger.kernel.org
    Cc: stable@vger.kernel.org
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    zx2c4 committed with jmberg Jun 10, 2017
  14. mac80211: set bss_info data before configuring the channel

    When mac80211 changes the channel, it also calls into the driver's
    bss_info_changed() callback, e.g. with BSS_CHANGED_IDLE. The driver
    may, like iwlwifi does, access more data from bss_info in that case
    and iwlwifi accesses the basic_rates bitmap, but if changing from a
    band with more (basic) rates to one with fewer, an out-of-bounds
    access of the rate array may result.
    
    While we can't avoid having invalid data at some point in time, we
    can avoid having it while we call the driver - so set up all the
    data before configuring the channel, and then apply it afterwards.
    
    This fixes https://bugzilla.kernel.org/show_bug.cgi?id=195677
    
    Reported-by: Johannes Hirte <johannes.hirte@datenkhaos.de>
    Tested-by: Johannes Hirte <johannes.hirte@datenkhaos.de>
    Debugged-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    jmberg committed Jun 10, 2017
  15. mac80211: remove 5/10 MHz rate code from station MLME

    There's no need for the station MLME code to handle bitrates for 5
    or 10 MHz channels when it can't ever create such a configuration.
    Remove the unnecessary code.
    
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    jmberg committed Jun 10, 2017
  16. mac80211: Fix incorrect condition when checking rx timestamp

    If the driver reports the rx timestamp at PLCP start, mac80211 can
    only handle legacy encoding, but the code checks that the encoding
    is not legacy. Fix this.
    
    Fixes: da6a435 ("mac80211: separate encoding/bandwidth from flags")
    Signed-off-by: Avraham Stern <avraham.stern@intel.com>
    Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    AviStern committed with jmberg Jun 12, 2017
  17. mac80211: don't look at the PM bit of BAR frames

    When a peer sends a BAR frame with PM bit clear, we should
    not modify its PM state as madated by the spec in
    802.11-20012 10.2.1.2.
    
    Cc: stable@vger.kernel.org
    Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Emmanuel Grumbach committed with jmberg Jun 8, 2017
  18. Merge tag 'xtensa-20170612' of git://github.com/jcmvbkbc/linux-xtensa

    Pull Xtensa fixes from Max Filippov:
    
     - don't use linux IRQ #0 in legacy irq domains: fixes timer interrupt
       assignment when it's hardware IRQ # is 0 and the kernel is built w/o
       device tree support
    
     - reduce reservation size for double exception vector literals from 48
       to 20 bytes: fixes build on cores with small user exception vector
    
     - cleanups: use kmalloc_array instead of kmalloc in simdisk_init and
       seq_puts instead of seq_printf in c_show.
    
    * tag 'xtensa-20170612' of git://github.com/jcmvbkbc/linux-xtensa:
      xtensa: don't use linux IRQ #0
      xtensa: reduce double exception literal reservation
      xtensa: ISS: Use kmalloc_array() in simdisk_init()
      xtensa: Use seq_puts() in c_show()
    torvalds committed Jun 13, 2017
  19. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/s390/linux
    
    Pull s390 fixes from Martin Schwidefsky:
    
     - A fix for KVM to avoid kernel oopses in case of host protection
       faults due to runtime instrumentation
    
     - A fix for the AP bus to avoid dead devices after unbind / bind
    
     - A fix for a compile warning merged from the vfio_ccw tree
    
     - Updated default configurations
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
      s390: update defconfig
      s390/zcrypt: Fix blocking queue device after unbind/bind.
      s390/vfio_ccw: make some symbols static
      s390/kvm: do not rely on the ILC on kvm host protection fauls
    torvalds committed Jun 13, 2017
Commits on Jun 12, 2017
  1. i40e: fix handling of HW ATR eviction

    A recent commit to refactor the driver and remove the hw_disabled_flags
    field accidentally introduced two regressions. First, we overwrote
    pf->flags which removed various key flags including the MSI-X settings.
    
    Additionally, it was intended that we have now two flags,
    HW_ATR_EVICT_CAPABLE and HW_ATR_EVICT_ENABLED, but this was not done,
    and we accidentally were mis-using HW_ATR_EVICT_CAPABLE everywhere.
    
    This patch adds the missing piece, HW_ATR_EVICT_ENABLED, and safely
    updates pf->flags instead of overwriting it.
    
    Without this patch we will have many problems including disabling MSI-X
    support, and we'll attempt to use HW ATR eviction on devices which do
    not support it.
    
    Fixes: 47994c1 ("i40e: remove hw_disabled_flags in favor of using separate flag bits", 2017-04-19)
    Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
    Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Jacob Keller committed with davem330 Jun 12, 2017
  2. hsr: fix incorrect warning

    When HSR interface is setup using ip link command, an annoying warning
    appears with the trace as below:-
    
    [  203.019828] hsr_get_node: Non-HSR frame
    [  203.019833] Modules linked in:
    [  203.019848] CPU: 0 PID: 158 Comm: sd-resolve Tainted: G        W       4.12.0-rc3-00052-g9fa6bf70 #2
    [  203.019853] Hardware name: Generic DRA74X (Flattened Device Tree)
    [  203.019869] [<c0110280>] (unwind_backtrace) from [<c010c2f4>] (show_stack+0x10/0x14)
    [  203.019880] [<c010c2f4>] (show_stack) from [<c04b9f64>] (dump_stack+0xac/0xe0)
    [  203.019894] [<c04b9f64>] (dump_stack) from [<c01374e8>] (__warn+0xd8/0x104)
    [  203.019907] [<c01374e8>] (__warn) from [<c0137548>] (warn_slowpath_fmt+0x34/0x44)
    root@am57xx-evm:~# [  203.019921] [<c0137548>] (warn_slowpath_fmt) from [<c081126c>] (hsr_get_node+0x148/0x170)
    [  203.019932] [<c081126c>] (hsr_get_node) from [<c0814240>] (hsr_forward_skb+0x110/0x7c0)
    [  203.019942] [<c0814240>] (hsr_forward_skb) from [<c0811d64>] (hsr_dev_xmit+0x2c/0x34)
    [  203.019954] [<c0811d64>] (hsr_dev_xmit) from [<c06c0828>] (dev_hard_start_xmit+0xc4/0x3bc)
    [  203.019963] [<c06c0828>] (dev_hard_start_xmit) from [<c06c13d8>] (__dev_queue_xmit+0x7c4/0x98c)
    [  203.019974] [<c06c13d8>] (__dev_queue_xmit) from [<c0782f54>] (ip6_finish_output2+0x330/0xc1c)
    [  203.019983] [<c0782f54>] (ip6_finish_output2) from [<c0788f0c>] (ip6_output+0x58/0x454)
    [  203.019994] [<c0788f0c>] (ip6_output) from [<c07b16cc>] (mld_sendpack+0x420/0x744)
    
    As this is an expected path to hsr_get_node() with frame coming from
    the master interface, add a check to ensure packet is not from the
    master port and then warn.
    
    Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Karicheri, Muralidharan committed with davem330 Jun 12, 2017