Commit Graph

33780 Commits

Author SHA1 Message Date
mofeifei
43bfffd85e docs: update cn trans idf-docker-image 2023-11-30 12:18:40 +01:00
Frantisek Hrbata
647c485a76 feat(docker): allow to add paths into git's safe.directory
With 8959555cee7e[1] ("setup_git_directory(): add an owner check for the top..")
git added an ownership check of the git directory and refuses to
run any git commands, even parsing the config file, if the git directory
is not owned by the current user. The "fatal: detected dubious ownership in repository"
is reported.

This fixes CVE-2022-24765[2], which allows to compromise user account. On a
multi-user system or e.g. on a shared file system, one user may create a "rogue"
git repository with e.g. core.fsmonitor set to an arbitrary command. Other user
may unwillingly execute this command by running e.g. git-diff or
git-status within the "rogue" git repository, which may be in one of the parent
directories. If e.g. PS1 is set to display information about a git
repository in CWD, as suggested in Git in Bash[3], the user do not need to run
any git command to trigger this, just entering some subdirectory under
this "rogue" git repository is enough, because the git command will be
started transparently through the script used in PS1. The core.fsmonitor
can be set to arbitrary command. It's purpose is to help git to identify changed files
and speed up the scanning for changed files.

rogue
├── .git     # owned by user1
└── dir1     # owned by user2
    ├── dir2 # owned by user2
    └── .git # owned by user2

user1 sets core.fsmonitor for git repository in rogue directory
$ git config --add core.fsmonitor "bash -c 'rm -rf \$HOME'"

user2 enters dir1 and runs e.g. git diff and triggers the core.fsmonitor command.

The ownership check may cause problems when running git commands in
ESP-IDF Docker container. For example user may run the container as
root, but the mounted project may be owned by a particular user.

In this case git will refuse to execute any git command within the
"/project" directory, because it's not owned by root. To overcome this,
git allows to set safe.directories, for which the ownership check is
skipped. The security check may be completely disabled by setting
safe.directories to "*". This solution was proposed in PR 12636[4], but
it would allow make it possible to exploit this vulnerability again.

This fix allows user to specify git's safe.directory in IDF_GIT_SAFE_DIR
environmental variable, which may be set during container startup.

The IDF_GIT_SAFE_DIR has same format as PATH and multiple directories can be
specified by using a ":" separator. To entirely disable this git security check
within the container, user may set IDF_GIT_SAFE_DIR='*'. This might be
heplfull in CI.

Closes https://github.com/espressif/esp-idf/pull/12636

[1] - 8959555cee
[2] - https://nvd.nist.gov/vuln/detail/cve-2022-24765
[3] - https://git-scm.com/book/en/v2/Appendix-A%3A-Git-in-Other-Environments-Git-in-Bash
[4] - https://github.com/espressif/esp-idf/pull/12636

Signed-off-by: Frantisek Hrbata <frantisek.hrbata@espressif.com>
2023-11-30 12:18:40 +01:00
Roland Dobai
4797d744fa Merge branch 'fix/coredump_port' into 'master'
fix(tools/coredump): do not detect port when core file is used

Closes IDFGH-11552

See merge request espressif/esp-idf!27441
2023-11-30 18:40:23 +08:00
Shu Chen
195d4013a2 Merge branch 'fix/lwip_na_packets_router_flag' into 'master'
feat(lwip): support NA router farwording flag set

See merge request espressif/esp-idf!27132
2023-11-30 17:48:42 +08:00
Ivan Grokhotkov
e39d1ae9ce Merge branch 'feature/update_unity' into 'master'
feat(unity): upgrade to 2.6.0-RC1

See merge request espressif/esp-idf!27456
2023-11-30 17:12:12 +08:00
Sudeep Mohanty
35fc493dcc Merge branch 'bugfix/freertos_incorrect_placement_of_unblocked_task_during_tick_increment' into 'master'
fix(freertos/idf): Refactor suspend-resume tests

Closes IDF-8364

See merge request espressif/esp-idf!26849
2023-11-30 15:53:31 +08:00
Kevin (Lao Kaiyao)
15803e14e9 Merge branch 'feature/add_esp32c5_beta3_soc_header_files' into 'master'
feat(esp32c5): add esp32c5 soc header files (stage 2, part 1)

See merge request espressif/esp-idf!27492
2023-11-30 15:07:04 +08:00
Kevin (Lao Kaiyao)
11461aff62 Merge branch 'feature/add_esp32c5_beta3_soc_header_files_part2' into 'master'
feat(esp32c5): add esp32c5-beta3 soc header files (stage2, part2)

See merge request espressif/esp-idf!27500
2023-11-30 14:35:54 +08:00
Jiang Jiang Jian
41400d8224 Merge branch 'feat/add_new_api_to_get_scan_ap_record' into 'master'
feat(wifi): add new api to get one scan ap record

Closes WIFI-6311, WIFIBUG-210, and WIFIBUG-211

See merge request espressif/esp-idf!26912
2023-11-30 13:56:51 +08:00
C.S.M
cce1bf36fc Merge branch 'bugfix/u32_reg_tsens' into 'master'
fix(temperature_sensor): Fix regs on temperature sensor is not volatile due to GCC bug

See merge request espressif/esp-idf!27468
2023-11-30 12:37:10 +08:00
Wang Meng Yang
0fb0fc8654 Merge branch 'bugfix/alarm_args_double_free' into 'master'
fix(bt/bluedroid): Free the alarm args only when it is not NULL

Closes BTQABR2023-141

See merge request espressif/esp-idf!27475
2023-11-30 10:27:14 +08:00
Armando (Dou Yiwen)
d36fe73960 Merge branch 'test/improve_sdmmc_tests' into 'master'
sd: improve tests and added on CI

See merge request espressif/esp-idf!27384
2023-11-30 10:21:11 +08:00
Marius Vikhammer
ae4be8eb03 Merge branch 'feature/p4_lp_core' into 'master'
feat(ulp/lp_core): Added basic support for building and running a LP-Core app on ESP32P4

Closes IDF-7534

See merge request espressif/esp-idf!26869
2023-11-30 09:35:49 +08:00
Adam Múdry
a4ff2decdd Merge branch 'fix/esp_vfs_fat_sdcard_format_workbuf_leak' into 'master'
fix: esp_vfs_fat_sdcard_format workbuf memory leak

Closes IDF-8779

See merge request espressif/esp-idf!27490
2023-11-30 05:42:00 +08:00
Alexey Lapshin
3ac31855b2 Merge branch 'contrib/github_pr_12683' into 'master'
fix(tools): fix path delimiter in gdbinit for Windows

Closes IDFGH-11562

See merge request espressif/esp-idf!27485
2023-11-30 04:57:07 +08:00
Gao Xu
4e843a1a70 Merge branch 'bugfix/fix_adc_continuous_do_not_rst_apb_clk' into 'master'
fix(adc): fix adc continuous get less results beacuse do not reset apb clk

Closes IDF-8414

See merge request espressif/esp-idf!27115
2023-11-30 00:22:48 +08:00
laokaiyao
d87e007c66 feat(esp32c5): add esp32c5-beta3 soc header files (part1) 2023-11-29 20:53:33 +08:00
laokaiyao
87f7d2edc4 feat(esp32c5): add esp32c5-beta3 soc header files (part2) 2023-11-29 20:48:52 +08:00
Kevin (Lao Kaiyao)
cd9d321062 Merge branch 'feature/introduce_target_esp32c5' into 'master'
feat(esp32c5): introduce target esp32c5 (stage 1)

See merge request espressif/esp-idf!27299
2023-11-29 20:31:34 +08:00
Adam Múdry
29c30b961d fix: esp_vfs_fat_sdcard_format workbuf memory leak 2023-11-29 12:39:15 +01:00
zhangyanjiao
b495f54329 fix(wifi): fix the crash issue when clear scan ap list 2023-11-29 19:23:35 +08:00
zhangyanjiao
0f18104d53 feat(wifi): add new api to get one scan ap record 2023-11-29 19:19:25 +08:00
GuyBrush
090bb85a12 fix(tools): fix path delimiter in gdbinit for Windows
Merges https://github.com/espressif/esp-idf/pull/12683

Signed-off-by: Alexey Lapshin <alexey.lapshin@espressif.com>
2023-11-29 13:54:48 +04:00
C.S.M
96f49c2603 Merge branch 'bugfix/bod_reset_c6_h2' into 'master'
fix(bod): Fix issue that RF cannot be enabled again after BOD triggered.

See merge request espressif/esp-idf!27287
2023-11-29 17:21:38 +08:00
Martin Vychodil
875849128f Merge branch 'feature/add_fatfs_sbom' into 'master'
feat(storage/fatfs): add sbom file manifest for FatFs

Closes IDF-8229

See merge request espressif/esp-idf!27436
2023-11-29 17:11:52 +08:00
Marius Vikhammer
99c88b9272 Merge branch 'feature/misc_core_build_tests_p4' into 'master'
ci(system): fixed and enabled misc system build tests

Closes IDF-8069, IDF-8071, and IDF-8119

See merge request espressif/esp-idf!27431
2023-11-29 16:58:07 +08:00
Armando (Dou Yiwen)
9674c5d467 Merge branch 'doc/esp32p4_sdmmc' into 'master'
doc: esp32p4 sdmmc programming guide

Closes IDF-7732

See merge request espressif/esp-idf!27171
2023-11-29 16:55:08 +08:00
Jin Cheng
823e0711c9 fix(bt/bluedroid): Set the alarm_arg to NULL after releasing to avoid double free 2023-11-29 15:55:46 +08:00
Tomas Rezucha
d315b97948 Merge branch 'fix/usb_uvc_example' into 'master'
fix(usb/uvc): Add negotiation retry for some cameras

Closes IDF-8085

See merge request espressif/esp-idf!27309
2023-11-29 15:38:53 +08:00
Tomas Sebestik
0b3ec55183 Merge branch 'remove/migrate-danger-gitlab' into 'master'
Remove/migrate danger gitlab

Closes RDT-523

See merge request espressif/esp-idf!27379
2023-11-29 15:14:23 +08:00
Rahul Tank
427f734dca Merge branch 'bugfix/add_legacy_adv_clear_vsc' into 'master'
fix(nimble): Add support for VSC to clear legacy adv memory

Closes BLERP-160

See merge request espressif/esp-idf!26561
2023-11-29 14:57:22 +08:00
gaoxu
7f296f2a20 ci(adc): add a test that adc continuous read after restarting 2023-11-29 14:30:25 +08:00
gaoxu
3acf3ec648 fix(adc): fix adc continuous get less results beacuse do not reset apb clk 2023-11-29 14:28:33 +08:00
Cao Sen Miao
b0c90ac456 fix(tempertuer_sensor): Fix regs on temperature sensor is not volatile due to GCC bug 2023-11-29 14:25:25 +08:00
Shu Chen
60da3e9c44 Merge branch 'fix/ieee802154_sleep_config' into 'master'
fix(ieee802154): fix ieeee802154 sleep enable configuration dependency issue

See merge request espressif/esp-idf!27389
2023-11-29 12:25:01 +08:00
Jiang Jiang Jian
145d40a120 Merge branch 'bugfix/fix_wifi_deinit_s_wifi_modem_sleep_lock' into 'master'
fix(wifi): fix wifi deinit s_wifi_modem_sleep_lock

See merge request espressif/esp-idf!27450
2023-11-29 12:15:51 +08:00
Armando
1400f3553d change(sdspi): disabled some tests (needs check/re-enable future) 2023-11-29 12:13:03 +08:00
Armando
368a11b618 refactor(sdmmc): remove sdmmc_console duplicate test cases 2023-11-29 12:13:03 +08:00
Armando
4aadacbcdc refactor(sdspi): added component pytest cases and enabled them on CI 2023-11-29 12:13:03 +08:00
Armando
9b0d75f2df refactor(sdmmc): added component pytest cases and enabled them on CI 2023-11-29 12:13:03 +08:00
Tomas Rezucha
62091b4fa0 fix(usb/uvc): Add negotiation retry for some cameras
Some cameras would refuse first stream format and would only accept
on second retry.
2023-11-29 11:34:47 +08:00
Lou Tian Hao
e4ba9ac3c4 Merge branch 'doc/change_deepsleep_example_readme' into 'master'
Doc/change deepsleep example readme

Closes IDFGH-11523

See merge request espressif/esp-idf!27413
2023-11-29 11:32:01 +08:00
Jiang Jiang Jian
234e5e8d09 Merge branch 'feat/max_ver_c3_199' into 'master'
feat(soc): Increase max supported version of C3 to 1.99

See merge request espressif/esp-idf!26821
2023-11-29 11:17:59 +08:00
Armando
f893750bb6 doc(sdmmc): doc(sdmmc): updated sdmmc programming guide for esp32p4 2023-11-29 11:13:14 +08:00
Armando
77299842ed doc(sdmmc): update emmc states 2023-11-29 11:13:09 +08:00
Marius Vikhammer
0c067fcb05 feat(ulp/lp_core): Added basic support for building and running a LP-Core app on ESP32P4 2023-11-29 10:50:40 +08:00
Aditya Patwardhan
77fbe13513 Merge branch 'bugfix/flash_encryption_build_failed' into 'master'
fix: fixed flash_encryption example build failure with certain config

Closes IDFGH-11492

See merge request espressif/esp-idf!27321
2023-11-29 10:10:40 +08:00
Ivan Grokhotkov
88fa79fcc7
feat(unity): upgrade to 2.6.0-RC1 2023-11-28 20:22:02 +01:00
Erhan Kurubas
4b0da52aa8 Merge branch 'save_isr_ctx_to_coredump' into 'master'
feat(coredump): save isr context to coredump elf file

Closes IDF-7790

See merge request espressif/esp-idf!27182
2023-11-28 23:40:11 +08:00
Jiang Jiang Jian
469dda11f9 Merge branch 'bugfix/nan_datapath_issues' into 'master'
Fix issues with NAN datapath

See merge request espressif/esp-idf!25595
2023-11-28 21:06:19 +08:00