pull-request: wireless-2022-10-13

pull-request: wireless-2022-10-13

[Johannes Berg]

Hi,

So as discussed previously, here are the fixes for the
scan parsing issues. I had to create a merge commit to
keep the stable commit IDs that we'd already used for
communication.

Please pull and let me know if there's any problem.

Thanks,
johannes



The following changes since commit abf93f369419249ca482a8911039fe1c75a94227:

  wifi: ath11k: mac: fix reading 16 bytes from a region of size 0 warning (2022-10-11 11:46:31 +0300)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git tags/wireless-2022-10-13

for you to fetch changes up to e7ad651c31c5e1289323e6c680be6e582a593b26:

  Merge branch 'cve-fixes-2022-10-13' (2022-10-13 11:59:56 +0200)

----------------------------------------------------------------
More wireless fixes for 6.1

This has only the fixes for the scan parsing issues.

----------------------------------------------------------------
Johannes Berg (10):
      wifi: cfg80211: fix u8 overflow in cfg80211_update_notlisted_nontrans()
      wifi: cfg80211/mac80211: reject bad MBSSID elements
      wifi: mac80211: fix MBSSID parsing use-after-free
      wifi: cfg80211: ensure length byte is present before access
      wifi: cfg80211: fix BSS refcounting bugs
      wifi: cfg80211: avoid nontransmitted BSS list corruption
      wifi: mac80211_hwsim: avoid mac80211 warning on bad rate
      wifi: mac80211: fix crash in beacon protection for P2P-device
      wifi: cfg80211: update hidden BSSes to avoid WARN_ON
      Merge branch 'cve-fixes-2022-10-13'

 Documentation/networking/phy.rst                   |  2 +-
 MAINTAINERS                                        |  1 +
 drivers/isdn/hardware/mISDN/hfcpci.c               |  3 +-
 drivers/net/ethernet/adi/adin1110.c                | 13 ++--
 drivers/net/ethernet/broadcom/Makefile             |  5 --
 drivers/net/ethernet/freescale/enetc/enetc_qos.c   |  1 -
 drivers/net/ethernet/marvell/octeontx2/af/mcs.c    |  4 +-
 .../ethernet/marvell/octeontx2/nic/cn10k_macsec.c  |  7 +-
 .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c   |  4 +-
 .../ethernet/marvell/prestera/prestera_matchall.c  |  2 +
 drivers/net/ethernet/mediatek/Makefile             |  5 --
 drivers/net/hyperv/hyperv_net.h                    |  3 +-
 drivers/net/hyperv/netvsc.c                        |  4 ++
 drivers/net/hyperv/netvsc_drv.c                    | 19 ++++++
 drivers/net/macvlan.c                              |  2 +-
 drivers/net/pse-pd/Kconfig                         |  1 +
 drivers/net/wireless/mac80211_hwsim.c              |  2 +
 drivers/ptp/ptp_ocp.c                              |  1 +
 include/net/ieee802154_netdev.h                    | 12 +++-
 net/dsa/port.c                                     |  2 +-
 net/ieee802154/socket.c                            |  7 +-
 net/ipv4/fib_semantics.c                           |  8 +--
 net/mac80211/ieee80211_i.h                         |  8 +++
 net/mac80211/rx.c                                  | 12 ++--
 net/mac80211/util.c                                | 30 +++++----
 net/sched/sch_taprio.c                             |  8 +--
 net/wireless/scan.c                                | 77 ++++++++++++++--------
 tools/testing/selftests/net/fib_nexthops.sh        |  5 ++
 28 files changed, 160 insertions(+), 88 deletions(-)

Re: pull-request: wireless-2022-10-13

[Jakub Kicinski]

On Thu, 13 Oct 2022 12:04:51 +0200 Johannes Berg wrote:
> So as discussed previously, here are the fixes for the
> scan parsing issues. I had to create a merge commit to
> keep the stable commit IDs that we'd already used for
> communication.
> 
> Please pull and let me know if there's any problem.

Odd, bot doesn't want to reply. Paolo pulled this a few hours ago FWIW.

Re: pull-request: wireless-2022-10-13

[Jakub Kicinski]

On Thu, 13 Oct 2022 12:04:51 +0200 Johannes Berg wrote:
> Please pull and let me know if there's any problem.

Since you asked if there are any problems... :)

net/wireless/scan.c:1677:61: warning: incorrect type in argument 2 (different address spaces)
net/wireless/scan.c:1677:61:    expected struct cfg80211_bss_ies const *new_ies
net/wireless/scan.c:1677:61:    got struct cfg80211_bss_ies const [noderef] __rcu *beacon_ies

Re: pull-request: wireless-2022-10-13

[Johannes Berg]

On Thu, 2022-10-13 at 08:32 -0700, Jakub Kicinski wrote:
> On Thu, 13 Oct 2022 12:04:51 +0200 Johannes Berg wrote:
> > Please pull and let me know if there's any problem.
> 
> Since you asked if there are any problems... :)
> 
> net/wireless/scan.c:1677:61: warning: incorrect type in argument 2 (different address spaces)
> net/wireless/scan.c:1677:61:    expected struct cfg80211_bss_ies const *new_ies
> net/wireless/scan.c:1677:61:    got struct cfg80211_bss_ies const [noderef] __rcu *beacon_ies
> 

Oh shoot, I had noticed this later and forgot about it ...

FWIW, it's harmless, but we do need to silence the sparse warning. I'll
add a follow-up patch for our next pull request, unless you want it
quickly, then I can send it to you directly?

johannes

Re: pull-request: wireless-2022-10-13

[Jakub Kicinski]

On Thu, 13 Oct 2022 18:13:00 +0200 Johannes Berg wrote:
> FWIW, it's harmless, but we do need to silence the sparse warning. I'll
> add a follow-up patch for our next pull request, unless you want it
> quickly, then I can send it to you directly?

Next PR is perfectly fine, I reckon.