This is a note to let you know that I've just added the patch titled
cfg80211: check S1G beacon compat element length
to the 5.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
cfg80211-check-s1g-beacon-compat-element-length.patch
and it can be found in the queue-5.11 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From b5ac0146492fc5c199de767e492be8a66471011a Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Thu, 8 Apr 2021 14:28:27 +0200
Subject: cfg80211: check S1G beacon compat element length
From: Johannes Berg <johannes.berg@xxxxxxxxx>
commit b5ac0146492fc5c199de767e492be8a66471011a upstream.
We need to check the length of this element so that we don't
access data beyond its end. Fix that.
Fixes: 9eaffe5078ca ("cfg80211: convert S1G beacon to scan results")
Link: https://lore.kernel.org/r/20210408142826.f6f4525012de.I9fdeff0afdc683a6024e5ea49d2daa3cd2459d11@changeid
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/wireless/scan.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -2352,14 +2352,16 @@ cfg80211_inform_single_bss_frame_data(st
return NULL;
if (ext) {
- struct ieee80211_s1g_bcn_compat_ie *compat;
- u8 *ie;
+ const struct ieee80211_s1g_bcn_compat_ie *compat;
+ const struct element *elem;
- ie = (void *)cfg80211_find_ie(WLAN_EID_S1G_BCN_COMPAT,
- variable, ielen);
- if (!ie)
+ elem = cfg80211_find_elem(WLAN_EID_S1G_BCN_COMPAT,
+ variable, ielen);
+ if (!elem)
return NULL;
- compat = (void *)(ie + 2);
+ if (elem->datalen < sizeof(*compat))
+ return NULL;
+ compat = (void *)elem->data;
bssid = ext->u.s1g_beacon.sa;
capability = le16_to_cpu(compat->compat_info);
beacon_int = le16_to_cpu(compat->beacon_int);
Patches currently in stable-queue which might be from johannes.berg@xxxxxxxxx are
queue-5.11/iwlwifi-pcie-properly-set-ltr-workarounds-on-22000-devices.patch
queue-5.11/mac80211-fix-txq-ac-confusion.patch
queue-5.11/nl80211-fix-beacon-head-validation.patch
queue-5.11/nl80211-fix-potential-leak-of-acl-params.patch
queue-5.11/rfkill-revert-back-to-old-userspace-api-by-default.patch
queue-5.11/cfg80211-check-s1g-beacon-compat-element-length.patch
queue-5.11/mac80211-fix-time-is-after-bug-in-mlme.patch
