Skip to content

Commit 785ace5

Browse files
author
Jiang Jiang Jian
committed
Merge branch 'bugfix/static_analyzer_rsnxe_fix' into 'master'
fix(esp_wifi): Add validation before accessing RSNXE Closes IDF-14257 See merge request espressif/esp-idf!42403
2 parents a8ace9d + 092338b commit 785ace5

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

components/wpa_supplicant/src/common/wpa_common.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,10 +411,10 @@ int wpa_parse_wpa_ie_rsnxe(const u8 *rsnxe_ie, size_t rsnxe_ie_len,
411411
uint8_t sae_pwe = esp_wifi_get_config_sae_pwe_h2e_internal(WIFI_IF_STA);
412412
memset(data, 0, sizeof(*data));
413413

414-
if (rsnxe_ie_len < 1) {
414+
if (rsnxe_ie_len < 3 || !rsnxe_ie) {
415415
return -1;
416416
}
417-
if (rsnxe_ie && rsnxe_ie[0] == WLAN_EID_VENDOR_SPECIFIC &&
417+
if (rsnxe_ie[0] == WLAN_EID_VENDOR_SPECIFIC &&
418418
rsnxe_ie[1] >= 1 + 4) {
419419
rsnxe_capa = rsnxe_ie[2 + 4];
420420
} else {

0 commit comments

Comments
 (0)