Hu Rui
c3a62f97b3
fix(uhci): rx fsm race condition and buffer size check
...
Closes https://github.com/espressif/esp-idf/issues/18819
Closes https://github.com/espressif/esp-idf/issues/18820
2026-07-29 19:31:30 +08:00
morris
a74daf64c8
Merge branch 'feat/i2s_duplex_update_v6.1' into 'release/v6.1'
...
feat(i2s): allow full duplex mode in less strict condition (v6.1)
See merge request espressif/esp-idf!50865
2026-07-29 19:12:34 +08:00
morris
c57c5d0f3e
Merge branch 'fix/legacy_twai_rx_non_iso_dlc_oob_v6.1' into 'release/v6.1'
...
fix(driver_twai): fixed legacy twai OOB issue when rx dlc larger than 8 (v6.1)
See merge request espressif/esp-idf!50749
2026-07-29 19:08:02 +08:00
morris
330a93fc47
Merge branch 'feat/uhci_send_multi_buffer_v6.1' into 'release/v6.1'
...
feat(uhci): support transmit multi buffer (v6.1)
See merge request espressif/esp-idf!50776
2026-07-29 19:04:49 +08:00
morris
0dfb87831f
Merge branch 'docs/i2s_ws_setting_v6.1' into 'release/v6.1'
...
docs(i2s): clarify WS width setting for standard mode (v6.1)
See merge request espressif/esp-idf!50665
2026-07-29 19:02:32 +08:00
morris
5a48938355
Merge branch 'fix/fix_i2s_i80_color_size_check_v6.1' into 'release/v6.1'
...
fix(lcd): add color size check for i80 and boundary check for rgb (v6.1)
See merge request espressif/esp-idf!50961
2026-07-29 19:02:09 +08:00
morris
1ab68e1e3c
Merge branch 'doces/add_pcnt_pull_migreation_guide_v6.1' into 'release/v6.1'
...
docs(pcnt): add gpio pull mode migration guide (v6.1)
See merge request espressif/esp-idf!51118
2026-07-29 19:01:10 +08:00
morris
71ed03fa91
Merge branch 'fix/fix_i2c_olde_example_hang_v6.1' into 'release/v6.1'
...
fix(i2c_oled): fix example hang when i2c transaction fails (v6.1)
See merge request espressif/esp-idf!50380
2026-07-29 19:00:50 +08:00
morris
f6aed42a49
Merge branch 'contrib/github_pr_18832_v6.1' into 'release/v6.1'
...
fix(mocks): add missing `esp_hal_*` includes (GitHub PR) (v6.1)
See merge request espressif/esp-idf!50726
2026-07-29 19:00:31 +08:00
morris
0d4aa7c27b
Merge branch 'backport/spi_flash_fixes_v6.1' into 'release/v6.1'
...
fix(spi_flash): backport aes-xts error-path & mxic fixes (v6.1)
See merge request espressif/esp-idf!51134
2026-07-29 19:00:02 +08:00
morris
135f8052f3
Merge branch 'bugfix/ppa_buffer_oob_v6.1' into 'release/v6.1'
...
fix(ppa): add checks for input to avoid any OOB access (v6.1)
See merge request espressif/esp-idf!51132
2026-07-29 18:58:57 +08:00
morris
f955f05a43
Merge branch 'bugfix/uart_sw_flow_ctrl_xoff_char_v6.1' into 'release/v6.1'
...
fix(uart): fix uart sw flow ctrl XOFF char write to wrong reg on ESP32C6 (v6.1)
See merge request espressif/esp-idf!50523
2026-07-29 18:57:00 +08:00
morris
967f047b62
Merge branch 'test/peripheral_drivers_on_real_encryption_runner_v6.1' into 'release/v6.1'
...
test(drivers): run flash encryption apps on real hardware (v6.1)
See merge request espressif/esp-idf!50675
2026-07-29 18:52:19 +08:00
morris
8f2ac25de4
Merge branch 'bugfix/ana_cmpr_macro_v6.1' into 'release/v6.1'
...
fix(ana_cmpr): Fix swapped POS/NEG cross interrupt masks on ESP32-C5/P4 (v6.1)
See merge request espressif/esp-idf!50798
2026-07-29 18:51:15 +08:00
Jiang Jiang Jian
f1e1468cff
Merge branch 'fix/ble-log-store-access-fault_v6.1' into 'release/v6.1'
...
fix: Ensure BLE Log Global Variables in Internal RAM (6.1)
See merge request espressif/esp-idf!51037
2026-07-29 16:54:11 +08:00
C.S.M
77f4f596aa
fix(spi_flash): Fix spi_flash leaks release aes-xts in error path
...
(cherry picked from commit 305c5869ee )
2026-07-24 14:52:14 +08:00
Shengyu Qu
8b5d316112
fix(spi_flash): add #if check for s_mxic_set_required_regs()
...
Currently, s_mxic_set_required_regs() lacks checking for
CONFIG_SPI_FLASH_SUPPORT_MXIC_OPI_CHIP. And this causes a defined but not
used warning when MXIC flash driver is disabled in project config. So add
a #if check for this to supress warning.
Signed-off-by: Shengyu Qu <wiagn@4d2.org >
(cherry picked from commit 062c948c18 )
2026-07-24 14:52:14 +08:00
Song Ruo Jing
34419ab57d
fix(ppa): add checks for input to avoid any OOB access
2026-07-24 14:40:40 +08:00
Chen Jichang
5ac3c30d5d
docs(pcnt): add gpio pull mode migration guide
...
Closes https://github.com/espressif/esp-idf/issues/18862
2026-07-24 11:04:30 +08:00
Zhou Xiao
a3e5f62bd4
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:26 +08:00
Chen Jichang
f881e73795
fix(lcd): add color size check for i80 and boundary check for rgb
2026-07-20 16:15:54 +08:00
Jiang Jiang Jian
cadfa9c096
Merge branch 'bugfix/rmac_scan_v6.1' into 'release/v6.1'
...
fix(esp_wifi): fix issues for scan, and NULL packets tx for random mac
See merge request espressif/esp-idf!50928
2026-07-18 22:12:00 +08:00
Jiang Jiang Jian
c8e90095fc
Merge branch 'bugfix/supplicant_crypto_code_correction_v6.1' into 'release/v6.1'
...
fix(wpa_supplicant): Correct some functions in crypto porting layer (v6.1)
See merge request espressif/esp-idf!50873
2026-07-18 21:04:55 +08:00
Shreyas Sheth
24017066f2
fix(esp_wifi): fix issues for scan, and NULL packets tx for random mac
2026-07-18 17:41:33 +08:00
Jiang Jiang Jian
66d5ec660e
Merge branch 'bugfix/fix_bredr_inq_crash_v6.1' into 'release/v6.1'
...
fix(bt/bluedroid): fix crash during bredr inquiry when zero-addr device is found (v6.1)
See merge request espressif/esp-idf!50853
2026-07-18 08:07:38 +08:00
Jiang Jiang Jian
e61a30edce
Merge branch 'backport/support-esp32s31-dfu-v6.1' into 'release/v6.1'
...
Feat/support esp32s31 dfu (v6.1)
See merge request espressif/esp-idf!50863
2026-07-18 08:07:22 +08:00
Jiang Jiang Jian
ad1d045c69
Merge branch 'bugfix/nan_mem_corruption_v6.1' into 'release/v6.1'
...
Fix(NAN): fix Memory Corruption due to BIP encryption (Backport v6.1)
See merge request espressif/esp-idf!50883
2026-07-18 02:18:48 +08:00
Jiang Jiang Jian
4752de43dc
Merge branch 'bugfix/add_en_rst_in_pvt_func_for_p4_backport_v6.1' into 'release/v6.1'
...
fix(pvt): add en reset in pvt func for p4 on release v6.1
See merge request espressif/esp-idf!50877
2026-07-18 01:34:50 +08:00
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