Skip to content
  1. Sep 09, 2017
  2. Sep 08, 2017
  3. Sep 07, 2017
    • Larry Finger's avatar
      rtlwifi: btcoexist: Fix antenna selection code · 6d622692
      Larry Finger authored
      
      
      In commit 87d8a9f3 ("rtlwifi: btcoex: call bind to setup btcoex"),
      the code turns on a call to exhalbtc_bind_bt_coex_withadapter(). This
      routine contains a bug that causes incorrect antenna selection for those
      HP laptops with only one antenna and an incorrectly programmed EFUSE.
      These boxes are the ones that need the ant_sel module parameter.
      
      Fixes: 87d8a9f3 ("rtlwifi: btcoex: call bind to setup btcoex")
      Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
      Cc: Ping-Ke Shih <pkshih@realtek.com>
      Cc: Yan-Hsuan Chuang <yhchuang@realtek.com>
      Cc: Birming Chiu <birming@realtek.com>
      Cc: Shaofu <shaofu@realtek.com>
      Cc: Steven Ting <steventing@realtek.com>
      Cc: Stable <stable@vger.kernel.org> # 4.13+
      Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
      6d622692
    • Larry Finger's avatar
      rtlwifi: btcoexist: Fix breakage of ant_sel for rtl8723be · a33fcba6
      Larry Finger authored
      
      
      In commit bcd37f4a ("rtlwifi: btcoex: 23b 2ant: let bt transmit when
      hw initialisation done"), there is an additional error when the module
      parameter ant_sel is used to select the auxilary antenna. The error is
      that the antenna selection is not checked when writing the antenna
      selection register.
      
      Fixes: bcd37f4a ("rtlwifi: btcoex: 23b 2ant: let bt transmit when hw initialisation done")
      Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
      Cc: Ping-Ke Shih <pkshih@realtek.com>
      Cc: Yan-Hsuan Chuang <yhchuang@realtek.com>
      Cc: Birming Chiu <birming@realtek.com>
      Cc: Shaofu <shaofu@realtek.com>
      Cc: Steven Ting <steventing@realtek.com>
      Cc: Stable <stable@vger.kernel.org> # 4.12+
      Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
      a33fcba6
    • Kleber Sacilotto de Souza's avatar
      tipc: remove unnecessary call to dev_net() · 8e0deed9
      Kleber Sacilotto de Souza authored
      
      
      The net device is already stored in the 'net' variable, so no need to call
      dev_net() again.
      
      Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
      Acked-by: default avatarYing Xue <ying.xue@windriver.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8e0deed9
    • Xin Long's avatar
      netlink: access nlk groups safely in netlink bind and getname · f7736080
      Xin Long authored
      
      
      Now there is no lock protecting nlk ngroups/groups' accessing in
      netlink bind and getname. It's safe from nlk groups' setting in
      netlink_release, but not from netlink_realloc_groups called by
      netlink_setsockopt.
      
      netlink_lock_table is needed in both netlink bind and getname when
      accessing nlk groups.
      
      Acked-by: default avatarFlorian Westphal <fw@strlen.de>
      Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f7736080
    • Xin Long's avatar
      netlink: fix an use-after-free issue for nlk groups · be82485f
      Xin Long authored
      
      
      ChunYu found a netlink use-after-free issue by syzkaller:
      
      [28448.842981] BUG: KASAN: use-after-free in __nla_put+0x37/0x40 at addr ffff8807185e2378
      [28448.969918] Call Trace:
      [...]
      [28449.117207]  __nla_put+0x37/0x40
      [28449.132027]  nla_put+0xf5/0x130
      [28449.146261]  sk_diag_fill.isra.4.constprop.5+0x5a0/0x750 [netlink_diag]
      [28449.176608]  __netlink_diag_dump+0x25a/0x700 [netlink_diag]
      [28449.202215]  netlink_diag_dump+0x176/0x240 [netlink_diag]
      [28449.226834]  netlink_dump+0x488/0xbb0
      [28449.298014]  __netlink_dump_start+0x4e8/0x760
      [28449.317924]  netlink_diag_handler_dump+0x261/0x340 [netlink_diag]
      [28449.413414]  sock_diag_rcv_msg+0x207/0x390
      [28449.432409]  netlink_rcv_skb+0x149/0x380
      [28449.467647]  sock_diag_rcv+0x2d/0x40
      [28449.484362]  netlink_unicast+0x562/0x7b0
      [28449.564790]  netlink_sendmsg+0xaa8/0xe60
      [28449.661510]  sock_sendmsg+0xcf/0x110
      [28449.865631]  __sys_sendmsg+0xf3/0x240
      [28450.000964]  SyS_sendmsg+0x32/0x50
      [28450.016969]  do_syscall_64+0x25c/0x6c0
      [28450.154439]  entry_SYSCALL64_slow_path+0x25/0x25
      
      It was caused by no protection between nlk groups' free in netlink_release
      and nlk groups' accessing in sk_diag_dump_groups. The similar issue also
      exists in netlink_seq_show().
      
      This patch is to defer nlk groups' free in deferred_put_nlk_sk.
      
      Reported-by: default avatarChunYu Wang <chunwang@redhat.com>
      Acked-by: default avatarFlorian Westphal <fw@strlen.de>
      Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      be82485f
    • Gao Feng's avatar
      sched: Use __qdisc_drop instead of kfree_skb in sch_prio and sch_qfq · 39ad1297
      Gao Feng authored
      
      
      The commit 520ac30f ("net_sched: drop packets after root qdisc lock
      is released) made a big change of tc for performance. There are two points
      left in sch_prio and sch_qfq which are not changed with that commit. Now
      enhance them now with __qdisc_drop.
      
      Signed-off-by: default avatarGao Feng <gfree.wind@vip.163.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      39ad1297
    • Baruch Siach's avatar
      dt-binding: phy: don't confuse with Ethernet phy properties · 9a94b3a4
      Baruch Siach authored
      
      
      The generic PHY 'phys' property sometime appears in the same node with
      the Ethernet PHY 'phy' or 'phy-handle' properties. Add a warning in
      phy-bindings.txt to reduce confusion.
      
      Signed-off-by: default avatarBaruch Siach <baruch@tkos.co.il>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9a94b3a4
    • Linus Torvalds's avatar
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 80cee03b
      Linus Torvalds authored
      Pull crypto updates from Herbert Xu:
       "Here is the crypto update for 4.14:
      
        API:
         - Defer scompress scratch buffer allocation to first use.
         - Add __crypto_xor that takes separte src and dst operands.
         - Add ahash multiple registration interface.
         - Revamped aead/skcipher algif code to fix async IO properly.
      
        Drivers:
         - Add non-SIMD fallback code path on ARM for SVE.
         - Add AMD Security Processor framework for ccp.
         - Add support for RSA in ccp.
         - Add XTS-AES-256 support for CCP version 5.
         - Add support for PRNG in sun4i-ss.
         - Add support for DPAA2 in caam.
         - Add ARTPEC crypto support.
         - Add Freescale RNGC hwrng support.
         - Add Microchip / Atmel ECC driver.
         - Add support for STM32 HASH module"
      
      * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (116 commits)
        crypto: af_alg - get_page upon reassignment to TX SGL
        crypto: cavium/nitrox - Fix an error handling path in 'nitrox_probe()'
        crypto: inside-secure - fix an error handling path in safexcel_probe()
        crypto: rockchip - Don't dequeue the request when device is busy
        crypto: cavium - add release_firmware to all return case
        crypto: sahara - constify platform_device_id
        MAINTAINERS: Add ARTPEC crypto maintainer
        crypto: axis - add ARTPEC-6/7 crypto accelerator driver
        crypto: hash - add crypto_(un)register_ahashes()
        dt-bindings: crypto: add ARTPEC crypto
        crypto: algif_aead - fix comment regarding memory layout
        crypto: ccp - use dma_mapping_error to check map error
        lib/mpi: fix build with clang
        crypto: sahara - Remove leftover from previous used spinlock
        crypto: sahara - Fix dma unmap direction
        crypto: af_alg - consolidation of duplicate code
        crypto: caam - Remove unused dentry members
        crypto: ccp - select CONFIG_CRYPTO_RSA
        crypto: ccp - avoid uninitialized variable warning
        crypto: serpent - improve __serpent_setkey with UBSAN
        ...
      80cee03b