diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2019-09-20 21:54:18 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-11 18:36:24 +0200 |
| commit | 66ab998269a11f906311005c8a16a65053580561 (patch) | |
| tree | ad29482621423a19422f34bbf76a335fb10ec744 /net/wireless | |
| parent | 92d042bd3ff4375204b4681f3f4b3ed948d6f087 (diff) | |
| download | linux-stable-66ab998269a11f906311005c8a16a65053580561.tar.gz linux-stable-66ab998269a11f906311005c8a16a65053580561.tar.bz2 linux-stable-66ab998269a11f906311005c8a16a65053580561.zip | |
cfg80211: validate SSID/MBSSID element ordering assumption
commit 242b0931c1918c56cd1dc5563fd250a3c39b996d upstream.
The code copying the data assumes that the SSID element is
before the MBSSID element, but since the data is untrusted
from the AP, this cannot be guaranteed.
Validate that this is indeed the case and ignore the MBSSID
otherwise, to avoid having to deal with both cases for the
copy of data that should be between them.
Cc: stable@vger.kernel.org
Fixes: 0b8fb8235be8 ("cfg80211: Parsing of Multiple BSSID information in scanning")
Link: https://lore.kernel.org/r/1569009255-I1673911f5eae02964e21bdc11b2bf58e5e207e59@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/scan.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index d66e6d4b7555..27d76c4c5cea 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -1711,7 +1711,12 @@ cfg80211_update_notlisted_nontrans(struct wiphy *wiphy, return; new_ie_len -= trans_ssid[1]; mbssid = cfg80211_find_ie(WLAN_EID_MULTIPLE_BSSID, ie, ielen); - if (!mbssid) + /* + * It's not valid to have the MBSSID element before SSID + * ignore if that happens - the code below assumes it is + * after (while copying things inbetween). + */ + if (!mbssid || mbssid < trans_ssid) return; new_ie_len -= mbssid[1]; rcu_read_lock(); |