From ef127ab9dd60414b766435c09f762b3a8ba6e93a Mon Sep 17 00:00:00 2001
From: ChenJianxing <chenjianxing@espressif.com>
Date: Tue, 15 Jun 2021 11:51:51 +0800
Subject: [PATCH] esp_wifi: fix amsdu & fragment vulnerabilities

---
 components/esp_rom/esp32c3/ld/esp32c3.rom.ld | 4 ++--
 components/esp_rom/esp32s3/ld/esp32s3.rom.ld | 4 ++--
 components/esp_wifi/lib                      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
index 13f8c108f9..dcafa5edd2 100644
--- a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
+++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
@@ -1577,7 +1577,7 @@ ppRecycleAmpdu = 0x400016f4;
 ppRecycleRxPkt = 0x400016f8;
 ppResortTxAMPDU = 0x400016fc;
 ppResumeTxAMPDU = 0x40001700;
-ppRxFragmentProc = 0x40001704;
+/* ppRxFragmentProc = 0x40001704; */
 ppRxPkt = 0x40001708;
 ppRxProtoProc = 0x4000170c;
 ppSearchTxQueue = 0x40001710;
@@ -1733,7 +1733,7 @@ ieee80211_search_node = 0x40001890;
 roundup2 = 0x40001894;
 ieee80211_crypto_encap = 0x40001898;
 ieee80211_crypto_decap = 0x4000189c;
-ieee80211_decap = 0x400018a0;
+/* ieee80211_decap = 0x400018a0; */
 ieee80211_set_tx_pti = 0x400018a4;
 wifi_is_started = 0x400018a8;
 /* Data (.data, .bss, .rodata) */
diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
index 229c794885..636d648be7 100644
--- a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
+++ b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
@@ -1882,7 +1882,7 @@ ppRecycleAmpdu = 0x4000561c;
 ppRecycleRxPkt = 0x40005628;
 ppResortTxAMPDU = 0x40005634;
 ppResumeTxAMPDU = 0x40005640;
-ppRxFragmentProc = 0x4000564c;
+/* ppRxFragmentProc = 0x4000564c; */
 ppRxPkt = 0x40005658;
 ppRxProtoProc = 0x40005664;
 ppSearchTxQueue = 0x40005670;
@@ -2043,7 +2043,7 @@ ieee80211_search_node = 0x40005b08;
 roundup2 = 0x40005b14;
 ieee80211_crypto_encap = 0x40005b20;
 ieee80211_crypto_decap = 0x40005b2c;
-ieee80211_decap = 0x40005b38;
+/* ieee80211_decap = 0x40005b38; */
 ieee80211_set_tx_pti = 0x40005b44;
 wifi_is_started = 0x40005b50;
 ieee80211_gettid = 0x40005b5c;
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index 3b9a2c3b05..ccffa701d5 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit 3b9a2c3b05baeef3fb495cfd1c9344e6e843466c
+Subproject commit ccffa701d55527ddc785134a71d9cb583d9f8e0a