From 720ccfdc7e796bbcb798d477eaf475194cb9e8f4 Mon Sep 17 00:00:00 2001 From: Akshat Agrawal Date: Fri, 31 Jul 2026 12:07:12 +0530 Subject: [PATCH] fix(nan): Fix bug bounty reported and discovered vulnerabilities in NAN Rx --- components/esp_wifi/include/esp_wifi_types_generic.h | 5 +++++ components/esp_wifi/lib | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/components/esp_wifi/include/esp_wifi_types_generic.h b/components/esp_wifi/include/esp_wifi_types_generic.h index 67f3ac0ce48..551ecb3a260 100644 --- a/components/esp_wifi/include/esp_wifi_types_generic.h +++ b/components/esp_wifi/include/esp_wifi_types_generic.h @@ -1281,6 +1281,11 @@ typedef enum { WIFI_BAND_2G_5G = 3, /* Band is 2,4G + 5G */ } wifi_band_t; +#define BIT_NUMBER_TO_CHANNEL(bit_number, band) ((band == WIFI_BAND_2G) ? (bit_number) : \ + ((bit_number >= 1 && bit_number <= 8) ? ((bit_number - 1) * 4 + 36) : \ + ((bit_number >= 9 && bit_number <= 20) ? ((bit_number - 9) * 4 + 100) : \ + ((bit_number >= 21 && bit_number <= 28) ? ((bit_number - 21) * 4 + 149) : 0)))) + /** Argument structure for WIFI_EVENT_AP_WRONG_PASSWORD event */ typedef struct { uint8_t mac[6]; /**< MAC address of the station trying to connect to Soft-AP */ diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 7e57442859f..eaf499e8621 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 7e57442859f84bafc196865a18033dee76b91bbb +Subproject commit eaf499e862117b3926411a9152dab6343b14e8b9