Jiang Jiang Jian
aa2e492a8c
Merge branch 'fix/esp32p4_secure_boot_sig_block_v6.1' into 'release/v6.1'
...
fix(esp32p4): secure boot (ECDSA-P384) and flash encryption eFuse fixes (v6.1)
See merge request espressif/esp-idf!50898
2026-07-18 01:32:56 +08:00
Jiang Jiang Jian
0f579637ed
Merge branch 'fix/fix_esp_tee_iv_length_check_v6.1' into 'release/v6.1'
...
feat(esp_tee): ESP-TEE Security Audit fixes (v6.1)
See merge request espressif/esp-idf!50850
2026-07-18 01:31:29 +08:00
Jiang Jiang Jian
88b053119a
Merge branch 'doc/bootloader-anti-rollback-fix_v6.1' into 'release/v6.1'
...
fix(docs): Update bootloader anti-rollback documentation (v6.1)
See merge request espressif/esp-idf!50837
2026-07-17 23:34:48 +08:00
Jiang Jiang Jian
a5b5f6f1cc
Merge branch 'bugfix/idfci-12737-fatfs-bdl-wl-storage-erase_v6.1' into 'release/v6.1'
...
fix(fatfs): erase storage partition before bdl_wl CI test (v6.1)
See merge request espressif/esp-idf!50889
2026-07-17 23:20:32 +08:00
Jiang Jiang Jian
9e4684c3bb
Merge branch 'bugfix/nvs-flash-erase-partition-leak_v6.1' into 'release/v6.1'
...
fix(nvs_flash): delete temporary NVSPartition after erase (v6.1)
See merge request espressif/esp-idf!50890
2026-07-17 23:19:59 +08:00
Jiang Jiang Jian
01083b8017
Merge branch 'bugfix/vfs_fat_readdir_stat_cache_v6.1' into 'release/v6.1'
...
fix(fatfs): move readdir-stat cache to per-DIR stream (v6.1)
See merge request espressif/esp-idf!50903
2026-07-17 23:19:45 +08:00
Jiang Jiang Jian
1513bf3f3d
Merge branch 'contrib/github_pr_18822_v6.1' into 'release/v6.1'
...
fix(esp_partition): prevent size_t overflow bypassing bounds checks on linux target (GitHub PR) (v6.1)
See merge request espressif/esp-idf!50907
2026-07-17 23:19:10 +08:00
Jiang Jiang Jian
392b949368
Merge branch 'contrib/github_pr_18829_v6.1' into 'release/v6.1'
...
fix(spiffs): fix off-by-one in spiffsgen.py obj name length check (GitHub PR) (v6.1)
See merge request espressif/esp-idf!50914
2026-07-17 23:19:06 +08:00
Laukik Hase
0809185c85
feat(esp_tee): Restrict REE access to TEE-owned secure storage keys
2026-07-17 18:14:38 +05:30
Laukik Hase
4861cd58c3
fix(esp_tee): Miscellaneous optimizations and fixes
...
Closes https://github.com/espressif/esp-idf/issues/18591
2026-07-17 18:14:38 +05:30
Ashish Sharma
5fb2dc6c74
fix(esp_tee): ensure hal assert is enabled for tee builds
2026-07-17 18:14:38 +05:30
Ashish Sharma
2fcdb164a1
fix(esp_tee): enforce MMU-map vaddr validity at the REE->TEE boundary
2026-07-17 18:14:37 +05:30
Ashish Sharma
c146cb5322
fix(esp_tee): fixes IV length check for TEE AEAD operations
2026-07-17 18:14:37 +05:30
sonika.rathi
2d3c9b981b
fix(spiffs): shorten obj_name_len guard comment
2026-07-17 13:50:34 +02:00
yi chen
9128ec1a98
fix(spiffs): fix off-by-one in spiffsgen.py obj name length check
...
SpiffsFS.create_file() rejected names only when strictly longer than
obj_name_len, but CONFIG_SPIFFS_OBJ_NAME_LEN's documented semantics
(see components/spiffs/Kconfig) are that the length includes the
zero-termination character, so the maximum number of actual name
characters is obj_name_len - 1.
With the old check, a name exactly obj_name_len characters long was
accepted. SpiffsObjIndexPage.to_binary() then computes the NUL padding
after the name as (obj_name_len - len(name)), which is 0 in that case,
so the generated image's fixed-size name field ends up with no NUL
terminator anywhere in its reserved region.
Fix the boundary so the generator enforces the same maximum length
that the Kconfig help text documents.
2026-07-17 13:02:37 +02:00
yi chen
afddc13e34
fix(esp_partition): prevent size_t overflow bypassing bounds checks on linux target
...
esp_partition_write/read/erase_range/mmap in partition_linux.c (the
`linux` target backend used by --preview set-target linux / host_test)
validated the requested range with `offset + size > partition->size`.
When `size` is close to SIZE_MAX, this addition wraps around size_t and
can evaluate to a small value, so the check passes even though the
request is far out of bounds. A caller passing e.g.
esp_partition_write(partition, 1, src, SIZE_MAX) sails through both
bounds checks and reaches the byte-copy loop with new_size == SIZE_MAX,
causing out-of-bounds reads/writes far past both the caller's buffer
and the mmap'd emulated-flash file.
Replace all four instances with the overflow-safe form already used by
the other esp_partition backends (partition_target.c,
partition_bootloader.c, partition_tee.c):
`size > partition->size - offset`, which is safe because the preceding
check already guarantees offset <= partition->size.
Signed-off-by: yi chen <94xhn1@gmail.com >
2026-07-17 12:48:25 +02:00
Jiang Jiang Jian
a43c51681a
Merge branch 'task/buildv2_full_pipeline_v6.1' into 'release/v6.1'
...
Enable full buildv2 pipeline (v6.1)
See merge request espressif/esp-idf!50351
2026-07-17 18:20:09 +08:00
Jiang Jiang Jian
522ee6dd74
Merge branch 'contrib/github_pr_18823_v6.1' into 'release/v6.1'
...
fix(vfs): use MAX_FDS instead of VFS_MAX_COUNT when clearing fd table on unregister (GitHub PR) (v6.1)
See merge request espressif/esp-idf!50697
2026-07-17 18:19:41 +08:00
Jiang Jiang Jian
961539aaa8
Merge branch 'contrib/github_pr_18817_v6.1' into 'release/v6.1'
...
fix(wear_levelling): guard WL_Flash::write()/read() against size==0 underflow (GitHub PR) (v6.1)
See merge request espressif/esp-idf!50730
2026-07-17 18:19:36 +08:00
sonika.rathi
2d6ac630a5
fix(fatfs): move readdir-stat cache to per-DIR stream
...
Move cached_fileinfo and dir_path from vfs_fat_ctx_t to vfs_fat_dir_t so
each open DIR* has its own readdir→stat cache.
2026-07-17 12:09:00 +02:00
nilesh.kale
446c4fb6c3
fix(bootloader_support): enable XTS-AES pseudo rounds for ESP32-P4
...
Burn XTS_DPA_PSEUDO_LEVEL efuse on P4 (rev >= 3.0) as done for other targets.
2026-07-17 15:15:50 +05:30
nilesh.kale
7ef8b58873
fix(bootloader_support): set SECURE_BOOT_SHA384_EN eFuse on ESP32-P4
...
Set SECURE_BOOT_SHA384_EN when enabling ECDSA-P384 Secure Boot V2 on
ESP32-P4, as done on C5/H4/S31, so that ROM verifies the bootloader
using the SHA-384 scheme. The eFuse exists only on the rev >= v3.0
eFuse table, so the Kconfig option is gated on rev >= v3.0.
2026-07-17 15:15:50 +05:30
nilesh.kale
3aea82e4b3
fix(esp_rom): correct ESP32-P4 secure boot signature block layout
2026-07-17 15:15:50 +05:30
Jiang Jiang Jian
0581c1e046
Merge branch 'fix/update_phylib_to_fix_esp32c61_bod_rts_v6.1' into 'release/v6.1'
...
fix(phy): fix esp32c61 bod rts(backport v6.1)
See merge request espressif/esp-idf!50862
2026-07-17 17:40:16 +08:00
sonika.rathi
c92a9fa318
fix(nvs_flash): delete temporary NVSPartition after erase
2026-07-17 10:57:16 +02:00
sonika.rathi
9f60629791
fix(fatfs): erase storage partition before bdl_wl CI test
2026-07-17 10:53:21 +02:00
Jiang Jiang Jian
9e9c16c724
Merge branch 'bugfix/change_pvt_timer_target_param_backport_v6.1' into 'release/v6.1'
...
feat(pvt): change pvt timer target & limit on release v6.1
See merge request espressif/esp-idf!50815
2026-07-17 16:12:52 +08:00
Jiang Jiang Jian
e56f3d4c20
Merge branch 'fix/jpeg_enc_encrypt_v6.1' into 'release/v6.1'
...
fix(jpeg): Jpeg can encode and decode in encryption situation (backport v6.1)
See merge request espressif/esp-idf!50662
2026-07-17 15:57:07 +08:00
Jiang Jiang Jian
997fdc8435
Merge branch 'feat/csi_error_event_v6.1' into 'release/v6.1'
...
Add MIPI-CSI error event (v6.1)
See merge request espressif/esp-idf!50680
2026-07-17 15:57:04 +08:00
Jiang Jiang Jian
9cf02d6dc4
Merge branch 'fix/fix_coex_iso_cache_error_v6.1' into 'release/v6.1'
...
fix(coex): Fixed BLE iso coex cache error (6.1)
See merge request espressif/esp-idf!50849
2026-07-17 11:43:27 +08:00
Jiang Jiang Jian
f2f57b2922
Merge branch 'fix/do_cache_lock_workaround_before_ipc_stall_v6.1' into 'release/v6.1'
...
fix(esp_hw_support): disable esp32 livelock workaround before stall another core (v6.1)
See merge request espressif/esp-idf!50768
2026-07-17 11:26:19 +08:00
yinqingzhao
e7a0abeae4
fix(phy): fix esp32c61 bod rts
2026-07-17 10:56:32 +08:00
Jiang Jiang Jian
9adc0ecf8e
Merge branch 'backport/spi_slave_add_independent_tx_rx_length-v6.1' into 'release/v6.1'
...
feat(driver_spi): slave driver support config different tx/rx length (v6.1)
See merge request espressif/esp-idf!49960
2026-07-17 10:54:57 +08:00
Jiang Jiang Jian
b3ec1371af
Merge branch 'fix/bootloader_anti_rollback_konfig_v6.1' into 'release/v6.1'
...
fix(bootloader): Hide bootloader anti-rollback Kconfig where not supported (v6.1)
See merge request espressif/esp-idf!50816
2026-07-17 10:54:17 +08:00
Jiang Jiang Jian
ec52a0cc95
Merge branch 'feat/tusb_msc_example_sdmmc_esp32s31_backport_v6.1' into 'release/v6.1'
...
feat(usb_device): Add SDMMC support for MSC USB Device example for esp32s31 target v6.1 backport
See merge request espressif/esp-idf!50827
2026-07-17 10:53:58 +08:00
muhaidong
d2d858c78e
fix(coex): fix coex status get issue
2026-07-17 10:49:42 +08:00
zhiweijian
f2cf653370
fix(coex): Fixed BLE iso coex cache error
2026-07-17 10:49:31 +08:00
Xu Si Yu
99eee46cef
fix(coex): move 15.4 register configuration to 15.4 init
2026-07-17 10:49:17 +08:00
Jiang Jiang Jian
beefc5c263
Merge branch 'feat/idfgh-17859_v6.1' into 'release/v6.1'
...
backport v6.1: add kconfig option for REGDMA sleep clock ICG
See merge request espressif/esp-idf!50471
2026-07-17 10:45:12 +08:00
Jiang Jiang Jian
07c65b3819
Merge branch 'feature/chip764_power_glitch_support_v6.1' into 'release/v6.1'
...
feat(s31): bootloader power glitch reset config (v6.1)
See merge request espressif/esp-idf!50545
2026-07-17 10:44:46 +08:00
Jiang Jiang Jian
526285007f
Merge branch 'fix/tx_power_validate_v6.1' into 'release/v6.1'
...
fix(bt): validate BR/EDR TX power against chip-supported range (v6.1)
See merge request espressif/esp-idf!50544
2026-07-17 10:32:04 +08:00
Jiang Jiang Jian
2dd51a0e75
Merge branch 'bugfix/avrc_ca_attr_id_check_v6.1' into 'release/v6.1'
...
fix(bt): Fix the validation of AVRCP metadata attr_id in handle_rc_attributes_rsp (v6.1)
See merge request espressif/esp-idf!50549
2026-07-17 10:31:02 +08:00
Jiang Jiang Jian
f8e6e94dca
Merge branch 'feat/usb_dfu_console_soc_caps_backport_v6.1' into 'release/v6.1'
...
feat(soc): add USB DFU and OTG console caps (backport v6.1)
See merge request espressif/esp-idf!49580
2026-07-17 10:30:26 +08:00
Jiang Jiang Jian
947e534927
Merge branch 'fix/mmap_cache_flash_wr_v6.1' into 'release/v6.1'
...
fix(mmap): fixed mmap read data wrong when flash being erased/written and cache not disabled (v6.1)
See merge request espressif/esp-idf!50117
2026-07-17 10:30:14 +08:00
Jiang Jiang Jian
14f663f003
Merge branch 'fix/pbkdf2_sha256_mbedtls4_guard_v6.1' into 'release/v6.1'
...
fix(wpa_supplicant): guard pbkdf2_sha256 for PSA-provided SHA-256 (v6.1)
See merge request espressif/esp-idf!50460
2026-07-16 18:57:43 +08:00
Jiang Jiang Jian
4fe6db39ca
Merge branch 'bugfix/bug_bounty_av_v6.1' into 'release/v6.1'
...
fix(bt/bluedroid): Fix bug bounty issues about A/V from NVIDIA (v6.1)
See merge request espressif/esp-idf!50476
2026-07-16 18:57:38 +08:00
Jiang Jiang Jian
adc1f663b4
Merge branch 'feat/add_lmp_dbg_vendor_v6.1' into 'release/v6.1'
...
feat(bt/controller): Added LMP debug vendor HCI and fixed some bugs ts on ESP32-S31 [backport v6.1]
See merge request espressif/esp-idf!50704
2026-07-16 18:56:58 +08:00
Konstantin Kondrashov
6b5a248638
fix(docs): Update bootloader anti-rollback documentation
2026-07-16 13:39:14 +03:00
Aditya Patwardhan
9dc17f98b0
Merge branch 'backport/44987_v6.1' into 'release/v6.1'
...
feat(esp-tls): Added a PSA driver for Secure Element (backport v6.1)
See merge request espressif/esp-idf!50334
2026-07-16 15:37:49 +05:30
hongshuqing
4ab85accea
feat(pwr_glitch): chip764 power glitch reset config
2026-07-16 17:51:17 +08:00