]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
wifi: cfg80211/mac80211: reject bad MBSSID elements
authorJohannes Berg <johannes.berg@intel.com>
Wed, 28 Sep 2022 20:01:37 +0000 (22:01 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 15 Oct 2022 06:02:57 +0000 (08:02 +0200)
commit4609a23ce88b5b1bde2a03a96c03df19fac18e7b
treebd1c5a55f31c562454a82984bb475503c3a8f04d
parentfc1ed6d0c9898a68da7f1f7843560dfda57683e2
wifi: cfg80211/mac80211: reject bad MBSSID elements

commit 8f033d2becc24aa6bfd2a5c104407963560caabc upstream.

Per spec, the maximum value for the MaxBSSID ('n') indicator is 8,
and the minimum is 1 since a multiple BSSID set with just one BSSID
doesn't make sense (the # of BSSIDs is limited by 2^n).

Limit this in the parsing in both cfg80211 and mac80211, rejecting
any elements with an invalid value.

This fixes potentially bad shifts in the processing of these inside
the cfg80211_gen_new_bssid() function later.

I found this during the investigation of CVE-2022-41674 fixed by the
previous patch.

Fixes: 0b8fb8235be8 ("cfg80211: Parsing of Multiple BSSID information in scanning")
Fixes: 78ac51f81532 ("mac80211: support multi-bssid")
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/mac80211/util.c
net/wireless/scan.c