Island
aaaadb64be
Merge branch 'fix/ble-log-store-access-fault_v6.0' into 'release/v6.0'
...
fix: Ensure BLE Log Global Variables in Internal RAM (6.0)
See merge request espressif/esp-idf!51036
2026-07-22 14:02:37 +08:00
Mahavir Jain
a96952e277
Merge branch 'fix/httpd-content-length-truncation_v6.0' into 'release/v6.0'
...
fix(esp_http_server): reject Content-Length above UINT32_MAX (backport v6.0)
See merge request espressif/esp-idf!50493
2026-07-22 09:22:58 +05:30
Jiang Jiang Jian
480c5435d8
Merge branch 'bugfix/dpp_backport_v6.0' into 'release/v6.0'
...
fix(esp_wifi): Backport dpp and other fixes
See merge request espressif/esp-idf!50723
2026-07-22 11:01:37 +08:00
Jiang Jiang Jian
8dec036cdd
Merge branch 'feature/adds_ipc_isr_safe_api_v6.0' into 'release/v6.0'
...
feat(ipc_isr): Adds IPC ISR safe API to stall other CPU (v6.0)
See merge request espressif/esp-idf!50964
2026-07-22 10:44:59 +08:00
Jiang Jiang Jian
ef47f0573c
Merge branch 'change/ble_update_lib_20260717_v6.0' into 'release/v6.0'
...
change(ble): [AUTO_MR] 20260717 - Update ESP BLE Controller Lib (6.0)
See merge request espressif/esp-idf!50932
2026-07-22 10:42:32 +08:00
Jiang Jiang Jian
7bcd65c9be
Merge branch 'fix/fix_esp_tee_iv_length_check_v6.0' into 'release/v6.0'
...
feat(esp_tee): ESP-TEE Security Audit fixes (v6.0)
See merge request espressif/esp-idf!50851
2026-07-22 10:37:48 +08:00
Jiang Jiang Jian
4c69588e41
Merge branch 'test/idf-additions-coverage_v6.0' into 'release/v6.0'
...
test(freertos): expand IDF additions test coverage (v6.0)
See merge request espressif/esp-idf!50820
2026-07-22 10:35:34 +08:00
Jiang Jiang Jian
f9058d5328
Merge branch 'feat/enable_cross_signed_cert_suppport_default_v6.0' into 'release/v6.0'
...
feat(mbedtls): enable cross signed certificate verification support by default (v6.0)
See merge request espressif/esp-idf!50535
2026-07-22 10:30:53 +08:00
Jiang Jiang Jian
bd994cb0f3
Merge branch 'bugfix/memory-safety-and-validation_v6.0' into 'release/v6.0'
...
fix(security): findings from project Vanessa (v6.0)
See merge request espressif/esp-idf!50391
2026-07-22 10:28:14 +08:00
Jiang Jiang Jian
5edd750418
Merge branch 'fix/harden_esp_security_v6.0' into 'release/v6.0'
...
fix(esp_security): harden crypto peripheral error handling (v6.0)
See merge request espressif/esp-idf!50325
2026-07-22 10:26:51 +08:00
Zhou Xiao
2bb70519ea
fix(bt): keep BLE log ISR state in internal RAM
...
(cherry picked from commit 2fa434eb50 )
Co-authored-by: Zhou Xiao <zhouxiao@espressif.com >
2026-07-21 19:44:18 +08:00
Martin Vychodil
406ac81a03
Merge branch 'contrib/github_pr_18400_v6.0' into 'release/v6.0'
...
Improve logging for VFS start_select function (GitHub PR) (v6.0)
See merge request espressif/esp-idf!49550
2026-07-21 19:30:10 +08:00
gadget-man
22d46e4f22
Fix bug in logging for VFS start_select function
...
Resolves issue identified in https://github.com/espressif/esp-idf/issues/18398 by seperating logging when `vfs == NULL`
Closes https://github.com/espressif/esp-idf/pull/18400
Closes https://github.com/espressif/esp-idf/issues/18398
2026-07-21 11:37:34 +02:00
Shreyas Sheth
b9066a7747
fix(esp_wifi): Backport dpp and other fixes
...
1) Fix crash while connecting to dpp akm
2) Fix phy ref cnt for power management for offchannel_tx
3) Introduced a variable to indicate dpp ap for scan results
4) Introduced WIFI_AUTH_UNKNOWN for ap with misconfigured security parameters
2026-07-21 13:52:33 +05:30
Alexey Gerenkov
f4058b3648
Merge branch 'enable_esp32p4_jtag_tests_v6.0' into 'release/v6.0'
...
Enable esp32p4 jtag tests (v6.0)
See merge request espressif/esp-idf!50547
2026-07-21 12:09:21 +08:00
morris
5d0975e307
Merge branch 'feat/i2s_duplex_update_v6.0' into 'release/v6.0'
...
feat(i2s): allow full duplex mode in less strict condition (v6.0)
See merge request espressif/esp-idf!50866
2026-07-21 11:09:18 +08:00
Jiang Jiang Jian
fb02baed9b
Merge branch 'bugfix/fix_some_coex_bugs_260720_v6.0' into 'release/v6.0'
...
Bugfix/fix some coex bugs 260720 v6.0(Backport v6.0)
See merge request espressif/esp-idf!50943
2026-07-21 10:56:10 +08:00
morris
ed43092fa5
Merge branch 'fix/fix_i2s_i80_color_size_check_v6.0' into 'release/v6.0'
...
fix(lcd): add color size check for i80 and boundary check for rgb (v6.0)
See merge request espressif/esp-idf!50962
2026-07-21 10:26:40 +08:00
morris
9a12e8c9d2
Merge branch 'fix/fix_image_header_check_v6.0' into 'release/v6.0'
...
image header: fixed image header segment count check (v6.0)
See merge request espressif/esp-idf!50935
2026-07-21 10:12:07 +08:00
Alexey Gerenkov
c0992a3a5a
Merge branch 'sysview_test_fixes_v6.0' into 'release/v6.0'
...
Sysview test fixes v6.0
See merge request espressif/esp-idf!50729
2026-07-20 18:45:30 +08:00
Konstantin Kondrashov
6b95e00788
feat(ipc_isr): adds IPC ISR safe API for other CPU stall API
2026-07-20 11:20:23 +03:00
Jiang Jiang Jian
6e1dc59ed9
Merge branch 'fix/blacklist_flag_correction_v6.0' into 'release/v6.0'
...
fix(wifi): Correct blacklist flag(v6.0)
See merge request espressif/esp-idf!50919
2026-07-20 16:17:55 +08:00
Chen Jichang
635ac8461c
fix(lcd): add color size check for i80 and boundary check for rgb
2026-07-20 16:16:03 +08:00
morris
9e040f4c20
Merge branch 'bugfix/ana_cmpr_macro_v6.0' into 'release/v6.0'
...
fix(ana_cmpr): Fix swapped POS/NEG cross interrupt masks on ESP32-C5/P4 (v6.0)
See merge request espressif/esp-idf!50799
2026-07-20 14:22:39 +08:00
Jiang Jiang Jian
a2cd919a64
Merge branch 'bugfix/bug_bounty_av_v6.0' into 'release/v6.0'
...
fix(bt/bluedroid): Fix bug bounty issues about A/V from NVIDIA (v6.0)
See merge request espressif/esp-idf!50477
2026-07-20 13:54:41 +08:00
muhaidong
ecf281be4a
fix(coex): fix coex status get issue
2026-07-20 12:02:23 +08:00
Xu Si Yu
a2b9628d49
fix(coex): move 15.4 register configuration to 15.4 init
2026-07-20 11:58:33 +08:00
Jiang Jiang Jian
3befd9d774
Merge branch 'bugfix/add_en_rst_in_pvt_func_for_p4_backport_v6.0' into 'release/v6.0'
...
fix(pvt): add en reset in pvt func for p4 on release v6.0
See merge request espressif/esp-idf!50882
2026-07-20 11:39:00 +08:00
Jiang Jiang Jian
f298dd2110
Merge branch 'bugfix/sdmmc-ddr-response-buffer-leak_v6.0' into 'release/v6.0'
...
fix(sdmmc): free DMA response buffer on DDR mode switch failure (v6.0)
See merge request espressif/esp-idf!50886
2026-07-20 10:45:54 +08:00
Jiang Jiang Jian
d1d8dd478d
Merge branch 'bugfix/nvs-flash-erase-partition-leak_v6.0' into 'release/v6.0'
...
fix(nvs_flash): delete temporary NVSPartition after erase (v6.0)
See merge request espressif/esp-idf!50891
2026-07-20 10:45:35 +08:00
Jiang Jiang Jian
f24018d113
Merge branch 'feature/enable_zb_for_esp32p4_v6.0' into 'release/v6.0'
...
feat(soc): enable zb* extensions for esp32p4 greater v3 (v6.0)
See merge request espressif/esp-idf!50779
2026-07-20 10:44:17 +08:00
Jiang Jiang Jian
06b8df9d7a
Merge branch 'doc/bootloader-anti-rollback-fix_v6.0' into 'release/v6.0'
...
fix(docs): Update bootloader anti-rollback documentation (v6.0)
See merge request espressif/esp-idf!50838
2026-07-20 10:41:12 +08:00
Jiang Jiang Jian
4f063a3166
Merge branch 'fix/bootloader_anti_rollback_konfig_v6.0' into 'release/v6.0'
...
fix(bootloader): Hide bootloader anti-rollback Kconfig where not supported (v6.0)
See merge request espressif/esp-idf!50817
2026-07-20 10:39:09 +08:00
Jiang Jiang Jian
a1b0ace41b
Merge branch 'fix/keep_use_secure_element_v6.0' into 'release/v6.0'
...
fix(esp-tls): Keep deprecated use_secure_element field for compatibility (v6.0)
See merge request espressif/esp-idf!50780
2026-07-20 10:38:38 +08:00
Jiang Jiang Jian
f5323ed82c
Merge branch 'contrib/github_pr_18817_v6.0' into 'release/v6.0'
...
fix(wear_levelling): guard WL_Flash::write()/read() against size==0 underflow (GitHub PR) (v6.0)
See merge request espressif/esp-idf!50731
2026-07-20 10:36:48 +08:00
Jiang Jiang Jian
21fdc1b01f
Merge branch 'contrib/github_pr_18823_v6.0' into 'release/v6.0'
...
fix(vfs): use MAX_FDS instead of VFS_MAX_COUNT when clearing fd table on unregister (GitHub PR) (v6.0)
See merge request espressif/esp-idf!50698
2026-07-20 10:34:04 +08:00
Euripedes Rocha
493af45bb4
Merge branch 'fix/sec-1162-1189-1190-null-checks_v6.0' into 'release/v6.0'
...
fix(esp_netif): harden NULL and OOM handling in netif APIs (SEC-1162, SEC-1189, SEC-1190) (v6.0)
See merge request espressif/esp-idf!50599
2026-07-20 04:32:58 +02:00
Euripedes Rocha
533fdf256b
Merge branch 'fix/sec-1137-br-glue-double-free_v6.0' into 'release/v6.0'
...
fix(esp_netif): harden br_glue instance-handler cleanup against double-free (SEC-1137) (v6.0)
See merge request espressif/esp-idf!50643
2026-07-20 04:32:26 +02:00
Erhan Kurubas
f6cc49eeb1
change(ci): limit printing OpenOCD connection errors
2026-07-20 10:31:28 +08:00
Jiang Jiang Jian
d5e6becd46
Merge branch 'fix/lwip_sec_high_v6.0' into 'release/v6.0'
...
fix(lwip): high severity lwip fixes (v6.0)
See merge request espressif/esp-idf!50591
2026-07-20 10:30:51 +08:00
Jiang Jiang Jian
04ccdc72e0
Merge branch 'feature/update-openocd-to-v0.12.0-esp32-20260703_v6.0' into 'release/v6.0'
...
feat(tools): update openocd version to v0.12.0-esp32-20260703 (v6.0)
See merge request espressif/esp-idf!50503
2026-07-20 10:30:15 +08:00
Aditya Patwardhan
ce1dea564f
fix(esp_http_server): reject Content-Length above UINT32_MAX
...
In httpd_parse.c, cb_headers_complete() converted the HTTP parser's
content_length (uint64_t) to the request's content_len (size_t) via an
unsafe cast through (int). On a 32-bit size_t target a Content-Length
above 4 GiB silently truncated, enabling request smuggling where the
server and an upstream proxy disagree on the body length (CWE-681).
Reject any Content-Length above UINT32_MAX with 413 Content Too Large
before any handler runs. UINT32_MAX is the largest body length the
server can represent in size_t content_len on every target, so this is
the maximum the server can support; no configuration knob is needed.
Closes SEC-102
Closes SEC-229
(cherry picked from commit 9d3f510c7f )
2026-07-20 10:29:46 +08:00
Ashish Sharma
7e36bb2db3
fix(esp_security): harden crypto peripheral error handling
2026-07-20 10:25:33 +08:00
Jiang Jiang Jian
55afa16a8a
Merge branch 'backport/bdl_ioctl_checker_v6.0' into 'release/v6.0'
...
feat(esp_blockdev): add build-time ioctl command reservation overlap checker (v6.0 backport)
See merge request espressif/esp-idf!50217
2026-07-20 10:21:59 +08:00
Armando (Dou Yiwen)
19784893df
fix: fixed image header segment count check
...
Signed-off-by: Armando (Dou Yiwen) <douyiwen@espressif.com >
2026-07-20 10:21:49 +08:00
Jin Chen
73b4ad275b
change(ble): [AUTO_MR] Update lib_esp32c6 to 18aafc6f
...
(cherry picked from commit 624845829a )
Co-authored-by: cjin <jinchen@espressif.com >
2026-07-20 09:04:10 +08:00
Jin Chen
5c7f2a64e3
change(ble): [AUTO_MR] Update lib_esp32c5 to 18aafc6f
...
(cherry picked from commit fa6e55229d )
Co-authored-by: cjin <jinchen@espressif.com >
2026-07-20 09:04:10 +08:00
Jin Chen
e7aa2b00ae
change(ble): [AUTO_MR] Update lib_esp32h2 to 18aafc6f
...
(cherry picked from commit d7b7876c3c )
Co-authored-by: cjin <jinchen@espressif.com >
2026-07-20 09:04:09 +08:00
Wang Meng Yang
bed9759dbb
Merge branch 'bugfix/avrc_ca_attr_id_check_v6.0' into 'release/v6.0'
...
fix(bt): Fix the validation of AVRCP metadata attr_id in handle_rc_attributes_rsp (v6.0)
See merge request espressif/esp-idf!50550
2026-07-19 14:37:06 +08:00
Wang Meng Yang
e3a54f6673
Merge branch 'bugfix/fix_bredr_inq_crash_v6.0' into 'release/v6.0'
...
fix(bt/bluedroid): fix crash during bredr inquiry when zero-addr device is found (v6.0)
See merge request espressif/esp-idf!50854
2026-07-19 12:45:13 +08:00