2021-04-08 14:46:12

by Johannes Berg

[permalink] [raw]
Subject: pull-request: mac80211 2021-04-08.2


Yes, I'm late with this, sorry about that. I've mostly restricted this
to the most necessary fixes, though the virt_wifi one isn't but since
that's not used a lot, it's harmless and included since it's obvious.
This updated version includes another netlink buffer overrun fix, as
reported by syzbot.

The only thing that's bigger is the rfkill thing, but that's just since
it adds a new version of the struct for userspace to use, since the
change to the existing struct caused various breakage all around.

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


The following changes since commit 8a12f8836145ffe37e9c8733dce18c22fb668b66:

net: hso: fix null-ptr-deref during tty device unregistration (2021-04-07 15:18:15 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git tags/mac80211-for-net-2021-04-08.2

for you to fetch changes up to 9a6847ba1747858ccac53c5aba3e25c54fbdf846:

nl80211: fix beacon head validation (2021-04-08 16:43:05 +0200)

Various small fixes:
* S1G beacon validation
* potential leak in nl80211
* fast-RX confusion with 4-addr mode
* erroneous WARN_ON that userspace can trigger
* wrong time units in virt_wifi
* rfkill userspace API breakage
* TXQ AC confusing that led to traffic stopped forever
* connection monitoring time after/before confusion
* netlink beacon head validation buffer overrun

A. Cody Schuffelen (1):
virt_wifi: Return micros for BSS TSF values

Ben Greear (1):
mac80211: fix time-is-after bug in mlme

Du Cheng (1):
cfg80211: remove WARN_ON() in cfg80211_sme_connect

Johannes Berg (5):
rfkill: revert back to old userspace API by default
mac80211: fix TXQ AC confusion
cfg80211: check S1G beacon compat element length
nl80211: fix potential leak of ACL params
nl80211: fix beacon head validation

Seevalamuthu Mariappan (1):
mac80211: clear sta->fast_rx when STA removed from 4-addr VLAN

drivers/net/wireless/virt_wifi.c | 5 ++-
include/uapi/linux/rfkill.h | 80 ++++++++++++++++++++++++++++++++++------
net/mac80211/cfg.c | 4 +-
net/mac80211/mlme.c | 5 ++-
net/mac80211/tx.c | 2 +-
net/rfkill/core.c | 7 ++--
net/wireless/nl80211.c | 10 +++--
net/wireless/scan.c | 14 ++++---
net/wireless/sme.c | 2 +-
9 files changed, 99 insertions(+), 30 deletions(-)