Commit Graph

53524 Commits

Author SHA1 Message Date
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
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
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
Akshat Agrawal
ef69a06834 Fix(NAN): fix Memory Corruption due to BIP encryption
- Set internal NAN params based on the user configurable Platform

 - On a secured NDP the responder could not derive keys
   (passphrase/credential mismatch); reject cleanly and
   fire ndp_terminated/ndp_confirm(REJECTED) on every
   teardown path so the host frees the NDP-ID.

 - Tear down the old NDP when the same peer re-initiates with
   a new M1, instead of rejecting and leaking the NDL.
2026-07-17 14:01:21 +05:30
Nachiket Kukade
5c0caacd07 fix(nan): Guard netif calls in NAN_STARTED default event handler
- Commit 08e98f6f30 utilises CONFIG_LWIP_ND6_SUPPORT_STATIC_ENTRIES
  for adding static entries.
- It moves netif calls that generate GOT IPv6 to NAN_STARTED default
  handler without guard, but guards the removal in NDP Confirm handler
- Fix the possible duplicate calls by putting calls from NAN_STARTED
  handler under CONFIG_LWIP_ND6_SUPPORT_STATIC_ENTRIES guard
2026-07-17 14:01:21 +05:30
Sarvesh Bodakhe
7ed4798191 fix(nan): log service match only after the security gate passes
- subscriber security gate, so a gated (dropped) match still logged an
   affirmative match line while no WIFI_EVENT_NAN_SVC_MATCH was posted.
   Log only when the event is sent.

 - security_cfg was copied into the service slot even with security_reqd=0,
   while credential validation only runs when security_reqd is set. Such an
   undeclared config silently armed the subscriber service-match security
   gate, suppressing match events. Scrub security_cfg from the working copy
   and warn instead.
2026-07-17 14:01:21 +05:30
wuzhenghui
d0867194d4 feat(esp_hw_support): fix esp32p4 PVT retention link 2026-07-17 16:25:25 +08:00
yanzihan@espressif.com
c6f556caa9 feat(pvt): add en reset in pvt func for p4 on master 2026-07-17 16:25:19 +08:00
Kapil Gupta
ce8fb56f9b fix(wpa_supplicant): Correct some functions in crypto porting layer 2026-07-17 13:52:44 +05:30
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
Jiang Guang Ming
5c3306ac04 fix(dfu): retry dfu-util flash on macOS detach failure
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-17 11:09:20 +08:00
JiangGuangMing
729241db7f docs: update docs with esp32s31 dfu feature 2026-07-17 11:09:20 +08:00
JiangGuangMing
a37b9efc90 feat: support esp32s31 dfu feature 2026-07-17 11:09:20 +08:00
yinqingzhao
e7a0abeae4 fix(phy): fix esp32c61 bod rts 2026-07-17 10:56:32 +08:00