Commit Graph

36748 Commits

Author SHA1 Message Date
Roland Dobai
abf3e8e543 Merge branch 'feature/docker_git_safe_dirs' into 'master'
feat(docker): allow to add dirs into git's safe.directory

Closes CVE-2022 and IDFGH-11511

See merge request espressif/esp-idf!27344
2023-12-01 15:02:09 +08:00
jgujarathi
8508363ce5 fix(wpa_supplicant): Restructuring DPP init method to ensure cleanup
- Restructuring DPP init function to ensure cleanup of variables in case of
  init failure
2023-12-01 12:23:03 +05:30
jgujarathi
76da067bce fix(wpa_supplicant): Fix location of clearing up dpp global variables
- Fix location of cleaing up dpp global variables to ensure that there are
  no concurrency issues.
2023-12-01 12:23:03 +05:30
jgujarathi
30c510020f fix(wpa_supplicant): Fix a memory leak in dpp deinit path
- Ensures that the auth information of dpp gets freed when there is
  dpp gets deinited.
2023-12-01 12:23:00 +05:30
C.S.M
2d4a9240dc Merge branch 'feat/add_example_usj' into 'master'
change(usb_serial_jtag): Add example for usb serial jtag echo

Closes IDFGH-11503, IDFGH-11493, and IDFGH-11478

See merge request espressif/esp-idf!27366
2023-12-01 14:39:14 +08:00
Zhang Xiao Yan
2c5e876a31 Merge branch 'docs/move_output_log_to_inc_files' into 'master'
docs: move the output log of targets to .inc files

See merge request espressif/esp-idf!27444
2023-12-01 14:19:49 +08:00
Island
682ca74e98 Merge branch 'bugfix/ble_update_lib_20231124' into 'master'
ble(update):Update c2 lib to 79ed4e8a,Update h2 lib to 9a237426,Update c6 lib to 9a237426

Closes BLERP-269 and BLERP-291

See merge request espressif/esp-idf!27391
2023-12-01 13:58:11 +08:00
Mahavir Jain
0df6afadef Merge branch 'fix/esp32s3_soc_drom_high_addr' into 'master'
fix(soc): esp32s3/Fix the DROM_HIGH_ADDR

See merge request espressif/esp-idf!27015
2023-12-01 12:41:59 +08:00
zhangyanjiao
550f858c0f fix(wifi/mesh): fix connection and opmoode error in mesh
1. fix the bug that station can't found AP when the authmode is WPA
2. fix wifi mode error when mesh start after station has connected to router

Closes https://github.com/espressif/esp-idf/issues/12646
2023-12-01 12:03:06 +08:00
Jakob Hasse
637d4c4381 fix(esp_hw_support): Removed unused include directories from cmake
* Closes https://github.com/espressif/esp-idf/issues/12700
2023-12-01 11:33:12 +08:00
Jiang Jiang Jian
e6a490c2ae Merge branch 'bugfix/dpp_listen_bugs' into 'master'
fix(wpa_supplicant): Fix few bugs in dpp

See merge request espressif/esp-idf!26792
2023-12-01 11:07:18 +08:00
Wang Meng Yang
76923a7a7f Merge branch 'bugfix/hci_param_check' into 'master'
fix(bt/controller): Fixed some HCI commands parameter

See merge request espressif/esp-idf!27423
2023-12-01 10:24:11 +08:00
wangtao@espressif.com
0d0de9da6b docs:Separate low-power documents 2023-12-01 10:13:19 +08:00
Marius Vikhammer
e680ecdbf6 Merge branch 'fix/err_to_name_component_only' into 'master'
fix(err_to_name): restrict gen_esp_err_to_name.py to only search in components/

See merge request espressif/esp-idf!26936
2023-12-01 10:11:34 +08:00
morris
d171a7b958 change(sdm): move driver to a new component: esp_driver_sdm 2023-12-01 10:03:48 +08:00
morris
846751216b feat(sdm): add driver support for esp32p4 2023-12-01 10:03:09 +08:00
Liu Linyan
9879615053 Merge branch 'update/ble_mesh_put_lib_in_submodule' into 'master'
fix(ble_mesh): Put Mesh 1.1 lib files in submodule

Closes IDFCI-1860

See merge request espressif/esp-idf!26987
2023-12-01 09:56:19 +08:00
Wang Meng Yang
eaa172033a Merge branch 'bugfix/alarm_args_double_free' into 'master'
fix(bt/bluedroid): Set the alarm_arg to NULL after releasing to avoid double free in l2cap

Closes BTQABR2023-141

See merge request espressif/esp-idf!27532
2023-12-01 09:32:39 +08:00
Roland Dobai
48d732f49c Merge branch 'fix/use_pytest_instead_xmlrunner' into 'master'
fix(ci): Remove unittest-xml-reporting dependency from host tests

See merge request espressif/esp-idf!27484
2023-12-01 00:33:41 +08:00
Darian Leung
8c2949a97e change(xtensa): Deprecate ".../xtensa_timer.h" include path
This commit deprecates the "freertos/xtensa_timer.h" and "xtensa/xtensa_timer.h"
include paths. Users should use "xtensa_timer.h" instead.

- Replace legacy include paths
- Removed some unnecessary includes of "xtensa_timer.h"
- Add warning to compatibility header
2023-11-30 21:58:52 +08:00
Darian Leung
a5d5ee7445 change(xtensa): Deprecate ".../xtensa_context.h" include path
This commit deprecates the "freertos/xtensa_context.h" and "xtensa/xtensa_context.h"
include paths. Users should use "xtensa_context.h" instead.

- Replace legacy include paths
- Removed some unnecessary includes of "xtensa_api.h"
- Add warning to compatibility header
2023-11-30 21:58:52 +08:00
Darian Leung
2204c8e137 change(xtensa): Deprecate ".../xtensa_api.h" include path
This commit deprecates the "freertos/xtensa_api.h" and "xtensa/xtensa_api.h"
include paths. Users should use "xtensa_api.h" instead.

- Replace legacy include paths
- Removed some unnecessary includes of "xtensa_api.h"
- Replaced some calls with "esp_cpu_..." equivalents
- Add warning to compatibility header
2023-11-30 21:58:52 +08:00
Roland Dobai
bc1d74bb88 fix(ci): Remove unittest-xml-reporting dependency from host tests 2023-11-30 14:03:41 +01:00
Tomas Sebestik
6e38fea5e9 Merge branch 'ci/update-mixed-template' into 'master'
ci: update Mixed Template, Release notes header

See merge request espressif/esp-idf!27478
2023-11-30 20:24:31 +08:00
Jin Cheng
48d410e10d fix(bt/bluedroid): Set the alarm_arg to NULL after releasing to avoid double free in l2cap 2023-11-30 19:47:57 +08:00
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
aditi_lonkar
bdeec024e8 fix(esp_wifi):Fix WDT when esp_supp_dpp_start_listen called multiple times 2023-11-30 15:37:17 +05:30
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
Liu Linyan
94d3f5037b fix(ble_mesh): Use submodule for mesh 1.1 lib files 2023-11-30 16:56:58 +08:00
Liu Linyan
2c579d03ca fix(ble_mesh): Remove the orginal mesh 1.1 lib files 2023-11-30 16:34:22 +08:00
Omar Chebib
dc8fdae31b docs(freertos): revert usage of hidden option CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE when :ref: is used 2023-11-30 16:33:28 +08:00
Frantisek Hrbata
18334588bc feat(tools): esp_idf_size.ng integration
This integrates esp_idf_size.ng, refactored esp-idf-size version, into
esp-idf and enables it by default. The esp_idf_size.ng may be enabled
by using the --ng option, but also via ESP_IDF_SIZE_NG env. variable,
which is used in this integration.

New -l/--legacy option is added, which enforces usage of the old version.
This option can be also set via "ESP_IDF_SIZE_LEGACY" env. variable.
This should allow to easily switch back to old version if there is any
problem.

The new version is used by default for all formats, except for the "json".

Examples:
$ idf.py size                           # uses refactored version
$ idf.py size --legacy                  # uses legacy version
$ idf.py size --l                       # uses legacy version
$ idf.py size --format json             # uses legacy version
$ idf.py size --format json2            # uses refactored version
$ export ESP_IDF_SIZE_LEGACY="1"        # use legacy version only from now on

ESP_IDF_SIZE_FORCE_TERMINAL, which forces terminal control codes(colors), is also set
when running from idf.py, so the colors are propagated even if stdout
for esp_idf_size.ng is not attached to tty.

The same changes are applied also to the idf_size.py wrapper.

There is an import check if esp_idf_size.ng is available. If not,
we switch into the legacy mode. This should cover situation when the
esp-idf has support for refactored version, but it's not installed.
This should also allow users to bind to a legacy version(<1.0.0) and the
idf.py size and idf_size.py should still work. This also allow us to
restring the version in constraints file if we need to switch back to
legacy version globally.

Signed-off-by: Frantisek Hrbata <frantisek.hrbata@espressif.com>
2023-11-30 09:26:51 +01: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
Cao Sen Miao
2a0debde3c change(usb_serial_jtag): Add a usb_serial_jtag echo example for how to use usb_serial_jtag APIs,
Closes https://github.com/espressif/esp-idf/issues/12620,
Closes https://github.com/espressif/esp-idf/issues/12605
2023-11-30 14:38:06 +08:00
Cao Sen Miao
b8e8042c4e fix(usb_serial_jtag): Fix issue that buffer seems not flush when TX buffer is full and flush slow,
Closes https://github.com/espressif/esp-idf/issues/12628
2023-11-30 14:38:06 +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
harshal.patil
47821f6299
fix(mbedtls/aes): fix AES interrupt allocation for AES-GCM operations 2023-11-30 11:59:59 +05:30
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
Tomas Rezucha
39d57f1cfd refactor(usb/host): Move FIFO size configuration to HAL layer
The logic of calculating FIFO sizes is DWC OTG specific.
We move it to the HAL layer to provide better abstraction in the HDC layer.
2023-11-30 12:04:30 +08:00
zhanghaipeng
a1b678e721 fix(bt/bluedroid): Fix bluedroid menuconfig 2023-11-30 10:43:12 +08:00
zhanghaipeng
a5a7e60ad0 docs(bt/bluedroid): Update ble example document 2023-11-30 10:42:49 +08:00
shangke
a7dc484564 fix(bt/controller): Fixed some HCI commands parameter 2023-11-30 02:41:56 +00: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
Tomas Rezucha
b258bbf068 refactor(usb/host): Make private hal types USB_DWC specific 2023-11-30 10:24:53 +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