espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-06 22:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_amsdu_fragment_vulnerability' into 'master'

Browse Source 
esp_wifi: fix amsdu & fragment vulnerabilities

Closes WIFI-3700 and WIFI-3733

See merge request espressif/esp-idf!13719
This commit is contained in:
Jiang Jiang Jian
2021-06-22 13:00:42 +00:00
parent d685e85ff4 ef127ab9dd
commit dd1352dec3
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp_rom/esp32c3/ld/esp32c3.rom.ld
View File

@@ -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) */

4
components/esp_rom/esp32s3/ld/esp32s3.rom.ld
View File

@@ -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;

2
components/esp_wifi/lib

Submodule components/esp_wifi/lib updated: 3b9a2c3b05...ccffa701d5