alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fixing_memory_leak_wps_scan_v4.1' into 'release/v4.1'

Browse Source 
wpa_supplicant : Fixed memory leak issue in wps scan(backport v4.1)

See merge request espressif/esp-idf!20990
This commit is contained in:
Jiang Jiang Jian 2022-11-25 10:44:34 +08:00
commit 37b65cfc4a
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/wpa_supplicant/src/esp_supplicant/esp_wps.c
View File

@ -597,6 +597,7 @@ wps_parse_scan_result(struct wps_scan_ie *scan)
for (count = 0; count < WPS_MAX_DIS_AP_NUM; count++) {
if (os_memcmp(sm->dis_ap_list[count].bssid, scan->bssid, ETH_ALEN) == 0) {
wpa_printf(MSG_INFO, "discard ap bssid "MACSTR, MAC2STR(scan->bssid));
wpabuf_free(buf);
return false;
}
}
@ -605,6 +606,9 @@ wps_parse_scan_result(struct wps_scan_ie *scan)
if (ap_found || sm->wps_pin_war) {
wpabuf_free(buf);
if (scan->ssid[1] > SSID_MAX_LEN) {
return false;
}
esp_wifi_enable_sta_privacy_internal();
os_memset(sm->config.ssid, 0, sizeof(sm->config.ssid));
strncpy((char *)sm->config.ssid, (char *)&scan->ssid[2], (int)scan->ssid[1]);
@ -1677,6 +1681,9 @@ _err:
sm->dev = NULL;
}
if (sm->wps_ctx) {
if (sm->wps_ctx->dh_privkey) {
wpabuf_free(sm->wps_ctx->dh_privkey);
}
os_free(sm->wps_ctx);
sm->wps_ctx = NULL;
}
@ -1733,6 +1740,9 @@ wifi_station_wps_deinit(void)
sm->dev = NULL;
}
if (sm->wps_ctx) {
if (sm->wps_ctx->dh_privkey) {
wpabuf_free(sm->wps_ctx->dh_privkey);
}
os_free(sm->wps_ctx);
sm->wps_ctx = NULL;
}

4
components/wpa_supplicant/src/utils/common.h
View File

@ -14,6 +14,9 @@
#include "os.h"
#include "esp_bit_defs.h"
#define SSID_MAX_LEN 32
/* Define platform specific variable type macros */
#if defined(ESP_PLATFORM)
#include <stdint.h>
@ -67,7 +70,6 @@ static inline unsigned int wpa_swap_32(unsigned int v)
#endif /* __CYGWIN__ || CONFIG_NATIVE_WINDOWS */
#ifndef WPA_BYTE_SWAP_DEFINED
#ifndef __BYTE_ORDER