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
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
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
Rahul Tank
bf03b83dfe
fix(nimble): Fix ECC HW byte-order and dropped SOC_ESP_NIMBLE_CONTROLLER
2026-07-16 12:29:32 +05:30
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
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
wanckl
ae628e4e98
fix(driver_twai): add fd test on ci
2026-07-15 11:23:51 +08:00
wanckl
9da7cc92b3
feat(driver_twai): fd hardware support time trigger trans
2026-07-15 11:23:44 +08:00
wanckl
f05afe5722
fix(driver_twai): fixed legacy twai OOB issue when rx dlc larger than 8
2026-07-15 10:47:22 +08:00
radek.tandler
daf4796ef6
fix(nvs_flash): fixed cleanup after nvs_set_blob failed on ESP_ERR_NVS_NOT_ENOUGH_SPACE
...
- fixed identification of blob parts to be cleaned by using right starting chunk index
- improved localisation of blobs for cases where some of pages get reclaimed
- created host test cases covering the edge cases above
2026-07-14 16:42:55 +02:00
Zhi Wei Jian
1ade9c6f0e
feat(ble/bluedroid): Support bluedroid dual identity
...
(cherry picked from commit 2358786647 )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-07-14 14:17:33 +08:00
Rahul Tank
8982238192
Merge branch 'bugfix/fix_bond_store_overflow_v6.0' into 'release/v6.0'
...
fix(nimble): Fix bond-store overflow when IRK is enabled (v6.0)
See merge request espressif/esp-idf!50624
2026-07-14 11:17:35 +05:30
Zhi Wei Jian
279ad49fb0
fix(ble/bluedroid): use BOOLEAN for BLE HCI command builders
...
(cherry picked from commit abbf001120 )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-07-14 12:04:31 +08:00
Zhi Wei Jian
05e35f842a
fix(ble/bluedroid): clean up LE CoC connect on CCB alloc failure
...
(cherry picked from commit 4fd1ebb4a9 )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-07-14 12:04:25 +08:00
Zhi Wei Jian
656af102e8
docs(ble/bluedroid): note ISO BIG HCI alloc failure not checked
...
(cherry picked from commit 34b59d30ae )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-07-14 12:04:25 +08:00
Zhi Wei Jian
8efe8f6ff4
fix(ble/bluedroid): fix direct-connect cleanup and adv bounds
...
(cherry picked from commit 82e71c1767 )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-07-14 12:04:24 +08:00
Zhi Wei Jian
395229d444
fix(ble/bluedroid): validate BLE confirm/OOB and sec-check device
...
(cherry picked from commit 93ab11d564 )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-07-14 12:04:24 +08:00
Zhi Wei Jian
273c463497
fix(ble/bluedroid): validate SMP pair-fail reason and OOB device
...
(cherry picked from commit 98efe02385 )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-07-14 12:04:23 +08:00
Zhi Wei Jian
179ea3578f
fix(ble/bluedroid): route ATT indication-conf timeout separately
...
(cherry picked from commit 6c3267ee84 )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-07-14 12:04:23 +08:00
Zhi Wei Jian
0e4c3ca05d
fix(ble/bluedroid): validate ATT PDU sizes
...
(cherry picked from commit bb00b9817d )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-07-14 12:04:23 +08:00
Zhi Wei Jian
7383c07af9
fix(ble/bluedroid): re-lookup GATT TCB after enc-complete callback
...
(cherry picked from commit 37562af0ea )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-07-14 12:04:22 +08:00
Zhi Wei Jian
c7d6a7ce9e
fix(ble/bluedroid): fix GATT long read and Service Changed CCC
...
(cherry picked from commit 4ce692ac0c )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-07-14 12:04:22 +08:00
Zhi Wei Jian
bd8ce47005
fix(ble/bluedroid): validate GATT client discovery handles
...
(cherry picked from commit ac35ae6f2d )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-07-14 12:04:21 +08:00
Zhi Wei Jian
98a8e41c83
fix(ble/bluedroid): cap Read By Type length and free failed service decl
...
(cherry picked from commit 27ff0cf8c7 )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-07-14 12:04:21 +08:00
Zhi Wei Jian
418cf61513
fix(ble/bluedroid): guard GATT database hash and serialization
...
(cherry picked from commit 995c1508e8 )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-07-14 12:04:21 +08:00
Zhi Wei Jian
de2544c5de
fix(ble/bluedroid): fix GATT server busy errors and sr_cmd handling
...
(cherry picked from commit f86739b03d )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-07-14 12:04:20 +08:00
Zhi Wei Jian
07f3362a98
fix(ble/bluedroid): fix GATT teardown and service-change flow
...
(cherry picked from commit 0645ba469d )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-07-14 12:04:20 +08:00
Zhi Wei Jian
bdba7a71d7
fix(ble/bluedroid): fix GATT service lifecycle leaks
...
(cherry picked from commit ac93d94958 )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-07-14 12:04:19 +08:00
Zhi Wei Jian
6e0ea41536
fix(ble/bluedroid): add GATT resource-cleanup helpers
...
(cherry picked from commit b83327f3ca )
Co-authored-by: zhiweijian <zhiweijian@espressif.com >
2026-07-14 12:04:19 +08:00