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
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
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
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
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
yangfeng
ca77dffadc
fix(bt): Fix the validation of AVRCP metadata attr_id in handle_rc_attributes_rsp
2026-07-19 10:26:33 +08:00
Rahul Tank
04ccb4c955
Merge branch 'bugfix/add_dis_ieee_udi_to_config_v6.0' into 'release/v6.0'
...
fix(nimble): Add option to disable IEEE and UDI Characteristic in DIS (v6.0)
See merge request espressif/esp-idf!50760
2026-07-18 09:31:45 +05:30
Wang Meng Yang
e743ff2a10
Merge branch 'bugfix/smp_sec_flags_v6.0' into 'release/v6.0'
...
fix(bt/bluedroid): fixed several security issues from NVIDIA (v6.0)
See merge request espressif/esp-idf!50566
2026-07-17 20:04:33 +08:00
Wang Meng Yang
27a5aba8e1
Merge branch 'feat/ble_log_compression_module_cfg_update_v6.0' into 'release/v6.0'
...
Feat/ble log compression module cfg update (6.0)
See merge request espressif/esp-idf!49875
2026-07-17 19:35:49 +08:00
Martin Vychodil
326a998708
Merge branch 'fix/sdmmc_cmd_err_switch_case_handling_v6.0' into 'release/v6.0'
...
fix(sdmmc): sdmmc_cmd.c fixed error handling in certain if and switch statements (v6.0)
See merge request espressif/esp-idf!50683
2026-07-17 18:23:40 +08:00
Sumeet Singh
73ef4148a8
fix(nimble): Add option to disable IEEE and UDI Characteristic in DIS (v6.0)
2026-07-17 14:57:20 +05:30
sonika.rathi
3ad5251819
fix(nvs_flash): delete temporary NVSPartition after erase
2026-07-17 10:57:27 +02:00
sonika.rathi
849a342fe0
fix(sdmmc): free DMA response buffer on DDR mode switch failure
2026-07-17 10:47:47 +02:00
Jiang Jiang Jian
a89931243c
Merge branch 'bugfix/change_pvt_timer_target_param_backport_v6.0' into 'release/v6.0'
...
feat(pvt): change pvt timer target & limit on release v6.0
See merge request espressif/esp-idf!50814
2026-07-17 16:13:16 +08:00
Rahul Tank
6a24b81921
Merge branch 'bugfix/add_extra_prints_v6.0' into 'release/v6.0'
...
fix(nimble): Remove SOC_ESP_NIMBLE_CONTROLLER from unnecessary locations (v6.0)
See merge request espressif/esp-idf!50095
2026-07-17 10:42:27 +05:30
morris
afb9f5a719
Merge branch 'feat/csi_error_event_v6.0' into 'release/v6.0'
...
Add MIPI-CSI error event (v6.0)
See merge request espressif/esp-idf!50681
2026-07-17 12:17:02 +08:00
Jiang Jiang Jian
7c49a6a4d8
Merge branch 'fix/move_cache_lock_workaround_out_of_ipc_stall_v6.0' into 'release/v6.0'
...
fix(esp_hw_support): disable esp32 livelock workaround before stall another core (v6.0)
See merge request espressif/esp-idf!50770
2026-07-17 11:26:23 +08:00
linruihao
eb81835174
fix(bt/bluedroid): fix crash during bredr inquiry when zero-addr device is found
2026-07-17 10:39:19 +08:00
Aditya Patwardhan
cc2cfc17ba
Merge branch 'fix/nvs-encrypted-partition-destructor-zeroize_v6.0' into 'release/v6.0'
...
fix(nvs_flash): zeroize XTS contexts when encrypted partition is destroyed (v6.0)
See merge request espressif/esp-idf!50806
2026-07-16 22:32:40 +05:30
morris
8ca8e00621
Merge branch 'feat/uhci_send_multi_buffer_v6.0' into 'release/v6.0'
...
feat(uhci): support transmit multi buffer (v6.0)
See merge request espressif/esp-idf!50777
2026-07-16 19:26:34 +08:00
morris
80f969e279
Merge branch 'isp_dma_one_frame_v6.0' into 'release/v6.0'
...
feat(isp): support isp dma input and add example (v6.0)
See merge request espressif/esp-idf!50755
2026-07-16 17:17:25 +08:00
luoxu
47e012a968
feat(ble): reorganize log compression Kconfig
...
Move log-compression Kconfig files to host/ and profile/mesh/ directories and update source paths.
2026-07-16 16:58:00 +08:00
sonika.rathi
0545b56e7a
fix(wear_levelling): shorten zero-size guard comments
2026-07-16 09:35:43 +02:00
Rahul Tank
bf03b83dfe
fix(nimble): Fix ECC HW byte-order and dropped SOC_ESP_NIMBLE_CONTROLLER
2026-07-16 12:29:32 +05:30
Konstantin Kondrashov
d5869bb6ee
fix(bootloader): Hide bootloader anti-rollback Kconfig where not supported
2026-07-16 09:38:04 +03:00
yanzihan@espressif.com
77effaabb2
feat(pvt): change pvt timer target & limit
2026-07-16 14:14:14 +08:00
Aditya Patwardhan
970b54962f
fix(nvs_flash): zeroize XTS contexts when encrypted partition is destroyed
...
NVSEncryptedPartition held two XTS_CONTEXT members (mEctxt, mDctxt) for
encryption / decryption. Their AES round keys are derived from the NVS
encryption key (HMAC-derived or plaintext from nvs_keys partition) and
therefore are sensitive secrets.
The destructor was empty, so when the NVS encrypted partition object
was destroyed -- on nvs_flash_deinit_partition(), on initialization
errors, and on any other teardown path -- the XTS round keys were left
in DRAM until the freed object's memory happened to be overwritten by
a later allocation. A subsequent stack/heap leak primitive would
recover the AES key from those bytes.
Fix:
* Initialize both XTS contexts in the constructor so the destructor's
free path is always safe (previously xts_init was only called in
init(); destruction before init() would have run xts_free on an
uninitialized struct).
* Provide a real destructor that calls XTS_FUNC(xts_free) on both
contexts, which performs mbedtls_platform_zeroize / esp_aes_xts free
semantics on the underlying AES contexts.
2026-07-16 10:34:01 +05:30
luoxu
5f25d81bed
feat(ble): split log compression Kconfig into separate mesh and host files
2026-07-16 11:24:47 +08:00
Luo Xu
2aba002266
fix(ble): fix Bluedroid log compression for newly added modules
...
(cherry picked from commit 8d4f1cb608 )
Co-authored-by: luoxu <luoxu@espressif.com >
2026-07-16 11:24:47 +08:00
Martin Vychodil
7b3c4fca5b
Merge branch 'fix/cleanup_after_failed_nvs_set_blob_v6.0' into 'release/v6.0'
...
Fixed cleanup after nvs_set_blob failed on ESP_ERR_NVS_NOT_ENOUGH_SPACE (v6.0)
See merge request espressif/esp-idf!50743
2026-07-15 18:41:21 +08:00
gaoxu
bdf42b6a99
ci(csi): added test for MIPI-CSI host error event
2026-07-15 18:14:36 +08:00
Aditya Patwardhan
d79940bd3b
fix(esp-tls): Keep deprecated use_secure_element field for compatibility
...
Restore the use_secure_element field in esp_tls_cfg_t, esp_tls_cfg_server_t
and httpd_ssl_config_t, and esp_transport_ssl_use_secure_element(), as
deprecated no-ops so that existing code keeps compiling. Setting them now
fails at runtime with ESP_ERR_NOT_SUPPORTED, as the feature is accessed
via the esp_key_config_t interface. To be removed in the next major release.
No compile-time deprecation attribute on this release branch; the field and
function stay warning-free here and carry only documentation notes.
2026-07-15 15:35:28 +05:30
Alexey Lapshin
8c6ac38275
feat(soc): enable zb* extensions for esp32p4 greater v3
2026-07-15 16:46:44 +07:00
Hu Rui
1dbf4678ef
feat(uhci): support transmit multi buffer
2026-07-15 17:34:38 +08:00
morris
f1ddd46629
Merge branch 'feat/sec_esp_drivers_v6.0' into 'release/v6.0'
...
fix(drivers): harden multiple peripheral drivers against local DoS and memory corruption (v6.0)
See merge request espressif/esp-idf!50557
2026-07-15 16:53:40 +08:00
wuzhenghui
68bb4a1c44
fix(esp_hw_support): disable esp32 livelock workaround before stall another core
2026-07-15 16:28:17 +08:00
morris
ff81dad1bd
Merge branch 'fix/legacy_twai_rx_non_iso_dlc_oob_v6.0' into 'release/v6.0'
...
fix(driver_twai): fixed legacy twai OOB issue when rx dlc larger than 8 (v6.0)
See merge request espressif/esp-idf!50750
2026-07-15 16:01:02 +08:00
Island
2dc3285e57
Merge branch 'bugfix/fix_bluedroid_read_multi_v6.0' into 'release/v6.0'
...
fix(ble/bluedroid): fix GATT Read Multiple response handling (6.0)
See merge request espressif/esp-idf!50709
2026-07-15 15:38:50 +08:00
gaoxu
e4f9f672b0
feat(isp): support isp dma input and add example
2026-07-15 14:15:28 +08:00
Island
1dc74d56a2
Merge branch 'feat/support_bluedroid_le_coc_and_eatt_v6.0' into 'release/v6.0'
...
feat(ble/bluedroid): Support bluedroid LE COC and EATT features (6.0)
See merge request espressif/esp-idf!50715
2026-07-15 14:02:50 +08:00
morris
4edbc85a4a
Merge branch 'bugfix/uart_sw_flow_ctrl_xoff_char_v6.0' into 'release/v6.0'
...
fix(uart): fix uart sw flow ctrl XOFF char write to wrong reg on ESP32C6 (v6.0)
See merge request espressif/esp-idf!50524
2026-07-15 11:52:07 +08:00
morris
a408170eca
Merge branch 'fix/jpeg_enc_encrypt_v6.0' into 'release/v6.0'
...
fix(jpeg): Jpeg can encode and decode in encryption situation (backport v6.0)
See merge request espressif/esp-idf!50664
2026-07-15 11:50:38 +08:00