Commit Graph

46021 Commits

Author SHA1 Message Date
Jiang Jiang Jian
974cc3bd2f Merge branch 'bugfix/wpa_supplicant_upstream_security_issues_v5.4' into 'release/v5.4'
esp_wifi: Port security issues from upstream supplicant (v5.4)

See merge request espressif/esp-idf!52677
2026-09-15 17:03:30 +08:00
Jiang Jiang Jian
b02075f64e Merge branch 'bugfix/idfci-13866_v5.4' into 'release/v5.4'
backport v5.4: config wakeup gpio pin internal pullup to avoid input floating

See merge request espressif/esp-idf!52776
2026-09-15 16:52:04 +08:00
Island
b65487a0c3 Merge branch 'feat/ble_smp_repairing_hardening_v5.4' into 'release/v5.4'
feat(ble/bluedroid): add Kconfig options for BLE re-pairing hardening (5.4)

See merge request espressif/esp-idf!52419
2026-09-15 14:12:10 +08:00
Jiang Jiang Jian
44d3b497b8 Merge branch 'fix-ieee802154-teardown-order_v5.4' into 'release/v5.4'
ieee802154: Fix teardown order (v5.4)

See merge request espressif/esp-idf!52663
2026-09-15 14:01:11 +08:00
Jiang Jiang Jian
a41015cc31 Merge branch 'fix/brownout_restore_after_deepsleep_reject_v5.4' into 'release/v5.4'
fix(esp_hw_support): restore brownout after deep sleep rejection on ESP32-S2 (v5.4)

See merge request espressif/esp-idf!52645
2026-09-14 20:25:17 +08:00
Li Shuai
d5d35ec90b fix(unit-test): config wakeup gpio pin internal pullup to avoid input floating 2026-09-14 15:34:42 +08:00
morris
ce54ec41f2 Merge branch 'fix/mcpwm_cap_prescale_v5.4' into 'release/v5.4'
fix(mcpwm): correct the wrong capture prescale (v5.4)

See merge request espressif/esp-idf!52507
2026-09-14 15:16:32 +08:00
wuzhenghui
eece49afa0 fix(esp_hw_support): restore brownout after deep sleep rejection on ESP32-S2
ESP32-S2 disables the brownout detector before deep sleep; if sleep is
rejected, re-init it so BOD is not left disabled (PM-519).

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-14 11:38:32 +08:00
Island
1f2a7fffec Merge branch 'change/ble_update_lib_20260904_v5.4' into 'release/v5.4'
change(ble): [AUTO_MR] 20260904 - Update ESP BLE Controller Lib (5.4)

See merge request espressif/esp-idf!52437
2026-09-14 10:36:15 +08:00
Rahul Tank
1d7d65b21a Merge branch 'bugfix/nimble_gattc_write_long_zero_len_v5.4' into 'release/v5.4'
fix(nimble): Send Prepare Write Request before Execute Write in write long with zero-length data (v5.4)

See merge request espressif/esp-idf!49769
2026-09-13 11:45:26 +05:30
Shreeyash Bhakare
b0df8ce4fd fix(nimble): Send Prepare Write Request before Execute Write with zero-length data 2026-09-11 15:00:35 +05:30
Rahul Tank
70b2846100 Merge branch 'bugfix/nimble_issues_08092026_v5.4' into 'release/v5.4'
fix few nimble issues 08092026(v5.4)

See merge request espressif/esp-idf!52604
2026-09-11 14:21:06 +05:30
zhaoweiliang
437e433b2a change(ble): [AUTO_MR] Update lib_esp32h2 to acd9a26e 2026-09-11 16:34:36 +08:00
zhaoweiliang
9a0ed2d666 change(ble): [AUTO_MR] Update lib_esp32c6 to acd9a26e 2026-09-11 16:34:24 +08:00
Island
861d6a8272 Merge branch 'fix/fxied_wrong_h2_ble_lib_issue_v5.4' into 'release/v5.4'
fix(ble): Check if there are illegal library files in controller lib path (5.4)

See merge request espressif/esp-idf!52189
2026-09-11 14:37:23 +08:00
Astha Verma
218f4c7b74 fix(nimble): Fix nimble HID service discovery 2026-09-11 11:15:56 +05:30
Shu Chen
b5b1a7a182 Merge branch 'fix/openthread-udp-host-interface_v5.4' into 'release/v5.4'
fix(openthread): preserve host interface on UDP receive (v5.4)

See merge request espressif/esp-idf!52692
2026-09-11 03:41:48 +00:00
Island
cff7bf2381 Merge branch 'feat/opt_prefer_bond_device_when_evicting_overflow_bonds_v5.4' into 'release/v5.4'
fix(bt/bluedroid): prefer disconnected peers when evicting overflow bonds (5.4)

See merge request espressif/esp-idf!52608
2026-09-10 20:51:08 +08:00
Island
1a4553cc4e Merge branch 'fix/esp32-ble-dtm-txbuf-leak_v5.4' into 'release/v5.4'
Fix DTM TX buffer leak in the BLE controller that could cause memory exhaustion and Interrupt WDT timeout during or after DTM TX tests. (5.4)

See merge request espressif/esp-idf!52613
2026-09-10 20:50:46 +08:00
Island
0e295ff16b Merge branch 'bugfix/fix_bluedroid_find_info_format_mismatch_v5.4' into 'release/v5.4'
fix(ble/bluedroid): restore find info PDU stop on UUID format mismatch (5.4)

See merge request espressif/esp-idf!52078
2026-09-10 20:50:28 +08:00
Rahul Tank
3051cb01fa Merge branch 'bugfix/hardware_error_assert_v5.4' into 'release/v5.4'
fix(nimble): Add hardware error event handling as normal event (v5.4)

See merge request espressif/esp-idf!52555
2026-09-10 17:08:48 +05:30
zwx
f32bc866b8 fix(openthread): preserve host interface on UDP receive 2026-09-10 16:44:53 +08:00
Rahul Tank
484eac66fc Merge branch 'bugfix/fix_coex_crash_v5.4' into 'release/v5.4'
fix(nimble): Prevent crash in deinit when host init was not completed (v5.4)

See merge request espressif/esp-idf!52567
2026-09-10 13:24:28 +05:30
morris
58d90182de Merge branch 'docs/mcpwm_deadtime_descrption_v5.4' into 'release/v5.4'
docs(mcpwm): add note for deadtime config (v5.4)

See merge request espressif/esp-idf!52642
2026-09-10 14:14:37 +08:00
Richard Allen
4f6b7dc818 TLS: Avoid discarded-qualifiers
Just a build issue fix depending on GCC5+ configuration, fixes:

assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
return discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]

Signed-off-by: Richard Allen <richard@bryghtlabs.com>
2026-09-10 11:33:26 +05:30
Jimi Chen
5d73153f81 SAE: Fix crash due to NULL pointer dereference in H2E parsing
In H2E (Hash-to-Element) mode, sae_parse_commit() parses the optional
Anti-Clogging Token Container by calling sae_parse_token_container().

However, callers of sae_parse_commit() that do not require retrieving
the anti-clogging token (such as PASN initiator/responder and SME auth)
pass NULL for the token and token_len output arguments.

If the peer sends a Commit frame containing a valid Anti-Clogging
Token Container element, sae_parse_token_container() unconditionally
sets *token and *token_len, resulting in a NULL pointer dereference
(SIGSEGV) and crashing wpa_supplicant.

Fix this by adding NULL checks before writing to token and token_len.
Update the debug log to print the token directly using 'pos'.

Fixes: 5e32fb0170f4 ("SAE: Use Anti-Clogging Token Container element with H2E")
Signed-off-by: Amarnath Hullur Subramanyam <amarnathhs@google.com>
2026-09-10 11:33:26 +05:30
Jouni Malinen
35ba8e5032 Require network_ctx and AKMP match for accepting PMKSA entry
When wpa_supplicant was processing EAPOL-Key msg 1/4 with a PMKID
indicated by the AP/Authenticator, a PMKSA for the same AA was accepted
without enforcing matching network_ctx (i.e., same network configuration
block) and AKMP. This could allow misbehaving APs to make wpa_supplicant
use an unacceptable PMKSA entry that was generated for a different
network for AKMP under certain conditions. This could result in showing
a connection to an incorrect network when an attacker has credentials to
one network in wpa_supplicant configuration, but not to another network.

Fix this by accepting the PMKID to set the PMKSA for an association only
if the PMKSA with the same PMKID is for the same network and was
generated using the same AKMP.

Signed-off-by: Jouni Malinen <jouni.malinen@oss.qualcomm.com>
2026-09-10 11:33:26 +05:30
Aditi
9afd391d1d feat(wpa_supplicant): Match SPA when searching PMKSA cache
Store the supplicant address (SPA) in PMKSA cache entries and match
it when looking up the PMKSA cache.

(partially picked from commit 18cbdbf2b1)
2026-09-10 11:33:26 +05:30
Rahul Tank
59976b088c fix(nimble): Prevent crash in deinit when host init was not completed 2026-09-10 11:31:50 +05:30
Island
a1364aab5c Merge branch 'feat/bt_osal_build_configurable_v5.4' into 'release/v5.4'
feat(bt): Add Kconfig option to build the BT OSAL conditionally (5.4)

See merge request espressif/esp-idf!51514
2026-09-10 12:02:53 +08:00
Rahul Tank
0953484a2b Merge branch 'bugfix/fix_ble_pair_attack_v5.4' into 'release/v5.4'
fix(nimble): Fix for BLERP attack (v5.4)

See merge request espressif/esp-idf!52353
2026-09-09 19:37:04 +05:30
zwx
b48301b3dc fix(ieee802154): fix teardown order 2026-09-09 18:58:22 +08:00
Chen Chen
242e6fa189 docs(mcpwm): add note for deadtime config
Closes https://github.com/espressif/esp-idf/issues/18654
2026-09-09 16:56:37 +08:00
Rahul Tank
2c0fff071b fix(nimble): Fix for BLERP attack 2026-09-09 14:06:04 +05:30
Rahul Tank
e6b4309966 Merge branch 'bugfix/fix_null_proc_dereference_v5.4' into 'release/v5.4'
fix(nimble): Avoid NULL proc dereference in GATT client procedures (v5.4)

See merge request espressif/esp-idf!52220
2026-09-09 13:57:07 +05:30
Zhang Hai Peng
111e58562d fix(bt): remove noisy OSI event handler enter/exit debug logs
These per-event traces fire on every async dispatch and flood BT logs
without aiding diagnosis; higher-layer traces remain for debugging.


(cherry picked from commit b9b9b8633f)

Co-authored-by: zhanghaipeng <zhanghaipeng@espressif.com>
2026-09-09 14:26:07 +08:00
Zhang Hai Peng
33d1a3029b fix(bt): update ESP32 libbtdm_app.a to 919c7f4b
- fixed dtm tx buffer leak issue


(cherry picked from commit ab7bb35192)

Co-authored-by: zhanghaipeng <zhanghaipeng@espressif.com>
2026-09-09 14:26:06 +08:00
Zhang Hai Peng
7ca394e038 fix(bt/bluedroid): prefer disconnected peers when evicting overflow bonds
When the bond list is full, drop the oldest disconnected device instead
of the oldest NVS entry, and allow a per-bond except flag so selected
devices are never auto-removed.


(cherry picked from commit bf86892eef)

Co-authored-by: zhanghaipeng <zhanghaipeng@espressif.com>
2026-09-09 14:25:51 +08:00
Rahul Tank
11a5032184 fix(nimble): Avoid NULL proc dereference in GATT client procedures 2026-09-09 10:27:24 +05:30
Rahul Tank
6bf2a2c3e8 Merge branch 'bugfix/fix_stale_conn_cccd_v5.4' into 'release/v5.4'
fix(nimble): fix crash on disconnect due to stale per-connection CCCD pool (v5.4)

See merge request espressif/esp-idf!51953
2026-09-09 10:21:20 +05:30
Rahul Tank
a211efe6f2 fix(nimble): fix crash on disconnect due to stale per-connection CCCD pool 2026-09-08 17:37:08 +05:30
Rahul Tank
3f17d0b73d Merge branch 'bugfix/fixed_ble_deinit_crash_issue_5.4' into 'release/v5.4'
fix(bt): fixed mempool deinit crash issue

See merge request espressif/esp-idf!52140
2026-09-08 17:23:20 +05:30
morris
51714344a4 Merge branch 'bugfix/uart_extra_current_consumption_in_sleep_v5.4' into 'release/v5.4'
fix(uart): reduce current consumption in sleep mode (v5.4)

See merge request espressif/esp-idf!52349
2026-09-08 15:08:01 +08:00
morris
d29f165015 Merge branch 'feat/add_timeout_return_for_dsi_panel_v5.4' into 'release/v5.4'
feat(dsi): add timeout check for lp cmd rx (v5.4)

See merge request espressif/esp-idf!52315
2026-09-08 14:46:07 +08:00
Rahul Tank
6871e1fe88 fix(nimble): Add hardware error event handling as normal event 2026-09-08 12:11:06 +05:30
ShenWeilong
e5acf5d5d7 fix(bt): fixed mempool deinit crash issue 2026-09-08 13:05:28 +08:00
Jiang Jiang Jian
c8faa8f261 Merge branch 'bugfix/qos_not_reported_v5.4' into 'release/v5.4'
fix(bt/controller): update ESP32 libbtdm_app.a to fix missing QoS_Setup_Cmpl event (v5.4)

See merge request espressif/esp-idf!52493
2026-09-08 10:36:26 +08:00
Zhang Hai Peng
c79c6c437f fix(ble/bluedroid): restore find info PDU stop on UUID format mismatch
Restore GATT_NO_RESOURCES when sequential attributes have differing UUID
sizes so gatts_process_find_info() stops building the response PDU.


(cherry picked from commit 196cb39545)

Co-authored-by: zhanghaipeng <zhanghaipeng@espressif.com>
2026-09-07 20:37:53 +08:00
Zhi Wei Jian
5fac3377f3 feat(ble/bluedroid): reject LE re-pairing that weakens an existing bond
Add smp_repairing_is_allowed() behind BT_BLE_SMP_HARDENED_REPAIRING so a
peer cannot replace an existing bond with one that has less MITM
protection, no Secure Connections, or a shorter key. Compare a preceding
Security Request against the pairing command AuthReq, not the
association-model result, and always allow first pairing.

A refusal keeps the stored bond. Pairing-failure erase is split by link
role: default is erase as Central and keep as Peripheral.

Closes BLERP (NDSS 2026) V3, V4 and V6.


(cherry picked from commit 88ea45be73)

Co-authored-by: zhiweijian <zhiweijian@espressif.com>
2026-09-07 19:18:28 +08:00
Zhi Wei Jian
734e55fcbf fix(ble/bluedroid): harden LE bond handling across encryption
Keep the existing bond until the new pairing is encrypted, and on encryption
failure drop the link instead of clearing keys. Recovering from a peer that
really deleted the bond is opt-in through BT_BLE_SMP_UNBOND_ON_KEY_MISSING.

Closes BLERP (NDSS 2026) V5, and stops an unauthenticated Pairing Request
from dropping the stored keys (V2 exploitation).


(cherry picked from commit f864615d7d)

Co-authored-by: zhiweijian <zhiweijian@espressif.com>
2026-09-07 19:18:28 +08:00