diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2022-11-25 12:36:57 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2022-11-25 12:43:05 +0100 |
| commit | 9f16b5c82a025cd4c864737409234ddc44fb166a (patch) | |
| tree | 25b5697b0e4155a75f8b9933b8bfb47862b4e94b /net | |
| parent | 0cdfa9e6f0915e3d243e2393bfa8a22e12d553b0 (diff) | |
| download | linux-rpi-9f16b5c82a025cd4c864737409234ddc44fb166a.tar.gz linux-rpi-9f16b5c82a025cd4c864737409234ddc44fb166a.tar.bz2 linux-rpi-9f16b5c82a025cd4c864737409234ddc44fb166a.zip | |
wifi: cfg80211: fix buffer overflow in elem comparison
For vendor elements, the code here assumes that 5 octets
are present without checking. Since the element itself is
already checked to fit, we only need to check the length.
Reported-and-tested-by: Sönke Huster <shuster@seemoo.tu-darmstadt.de>
Fixes: 0b8fb8235be8 ("cfg80211: Parsing of Multiple BSSID information in scanning")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireless/scan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index da752b0cc752..4d217798890a 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -330,7 +330,8 @@ static size_t cfg80211_gen_new_ie(const u8 *ie, size_t ielen, * determine if they are the same ie. */ if (tmp_old[0] == WLAN_EID_VENDOR_SPECIFIC) { - if (!memcmp(tmp_old + 2, tmp + 2, 5)) { + if (tmp_old[1] >= 5 && tmp[1] >= 5 && + !memcmp(tmp_old + 2, tmp + 2, 5)) { /* same vendor ie, copy from * subelement */ |