Commit Graph

14641 Commits

Author SHA1 Message Date
David Cermak
92f7ecd632 lwip: Security fixes; PPPoS null-deref; NAPT ip-forward
* Cherry-pick important fixes to 2.1.2-esp
  - CVE-2020-22283: Attacker could craft a packet that would disclose 8 bytes of some heap memory:
    - icmp6: Don't copy too much data
    - icmp6: Fix copying of chained pbuf in reply
    - icmp6: keep to the RFC and send as much as possible with icmp6 error messages
  - CVE-2020-22284: ZEP - ZigBee Encapsulation Protocol/6LoWPAN is not supported in IDF,
    the netif module (zepif.c) is not included in the build, but users can still inject
    the file into compilation process, implement IO interface and use this.
    - zepif: Copy possibly chained output pbuf properly
    - Add #define for minimum IPv6 MTU length
    - pbuf: Add pbuf_copy_partial_pbuf library function
* PPPoS: Fix null-deref when processing double break packet
  - pppos: fix in_tail null (espressif/esp-lwip@537c69d5)
  - PPP: Add test exhibiting empty packet null-deref (espressif/esp-lwip@202a07da)
* NAPT: Fix PBUF_REF type to clone the pbuf before forwarding
  - IP-FORWARD: If packet-type is PBUF_REF clone it before forwarding
  - Add NAPT unit test to exercise NAT feature for both RAM and REF pbuf types
* version: Update version numbers to match 2.1.2-esp

* Update submodule: 2749568fe1...76303df238
  - test/napt: Add unit test for IP forward with PBUF_REF (espressif/esp-lwip@76303df2)
  - napt: Fix PBUF_REF type to clone the pbuf before forwarding (espressif/esp-lwip@39068263)
  - version: Update version numbers to match 2.1.2-esp (espressif/esp-lwip@2b922919)
  - pppos: fix in_tail null (espressif/esp-lwip@537c69d5)
  - PPP: Add test exhibiting empty packet null-deref (espressif/esp-lwip@202a07da)
  - pbuf: Add pbuf_copy_partial_pbuf library function (espressif/esp-lwip@1c9cd9c1)
  - Add #define for minimum IPv6 MTU length (espressif/esp-lwip@d2dc577b)
  - zepif: Copy possibly chained output pbuf properly (espressif/esp-lwip@64ab7f2a)
  - icmp6: Don't copy too much data (espressif/esp-lwip@4a64731b)
  - icmp6: Fix copying of chained pbuf in reply (espressif/esp-lwip@7c822ff4)
  - icmp6: keep to the RFC and send as much as possible with icmp6 error messages (espressif/esp-lwip@29100ab6)
  - dns: Add API to clear dns cache (espressif/esp-lwip@ee59f77d)
  - CI: Fixed adding gitlab key (espressif/esp-lwip@5a2bdba7)
  - test case: modify test case test_tcp_new_max_num_remove_FIN_WAIT_1 (espressif/esp-lwip@6b090f7d)

Closes https://github.com/espressif/esp-idf/issues/8300
Closes https://github.com/espressif/esp-idf/issues/8451
2022-03-08 09:38:42 +01:00
Aditya Patwardhan
8f67af174e Merge branch 'contrib/github_pr_8462' into 'master'
Add WolfSSL esp_tls TLS1.3 configuration option (GitHub PR)

Closes IDFGH-6838 and IDFGH-6683

See merge request espressif/esp-idf!17324
2022-03-08 10:57:05 +08:00
Zim Kalinowski
0440aca4e3 Merge branch 'feature/reevaluate_headers_include_dirs' into 'master'
esp_hw_support/esp_system: Re-evaluate header inclusions and include directories

See merge request espressif/esp-idf!16763
2022-03-08 01:32:24 +08:00
morris
4aa81975d1 Merge branch 'bugfix/i2c_fix_typo_of_slave_macro' into 'master'
i2c: fix typo in SOC_I2C_SUPPORT_SALVE

Closes IDFGH-6893

See merge request espressif/esp-idf!17373
2022-03-07 23:38:13 +08:00
Ivan Grokhotkov
5f1c6ac605 Merge branch 'contrib/github_pr_8500' into 'master'
Fix compiler error in mbedtls (GitHub PR)

Closes IDFGH-6879 and IDFGH-6881

See merge request espressif/esp-idf!17380
2022-03-07 22:17:30 +08:00
Vamshi Gajjela
a9454c9776 Merge branch 'feature/sdmmc_erase_cmd_support' into 'master'
[sdmmc] Add erase command support

Closes IDFGH-5947 and IDFGH-5935

See merge request espressif/esp-idf!17054
2022-03-07 21:52:23 +08:00
Ivan Grokhotkov
5bc1cd7d26 Merge branch 'feature/flash_emu_linux_component' into 'master'
[spi_flash] LINUX target emulation of Partition API

See merge request espressif/esp-idf!13929
2022-03-07 20:36:38 +08:00
Simon
4bf4a020a6 Merge branch 'refactor/abstract_temperature_sensor' into 'master'
temperature_sensor: Refactor temperature sensor to new APIs (follow rule of driverNG) and support esp32s3

Closes IDF-3665, IDF-3367, and IDF-1793

See merge request espressif/esp-idf!16787
2022-03-07 20:17:39 +08:00
Alexander Klassen
a46776ad02 Add WolfSSL esp_tls TLS1.3 configuration option
Closes https://github.com/espressif/esp-idf/issues/8313
2022-03-07 09:44:23 +00:00
Island
f31be6ca5d Merge branch 'feature/add_proxy_conn_and_disconn_event' into 'master'
ble_mesh: stack: Add proxy server connect and disconnect event

See merge request espressif/esp-idf!16917
2022-03-07 15:10:22 +08:00
0xFEEDC0DE64
9b7c345bce Fix compiler error in mbedtls
Closes https://github.com/espressif/esp-idf/pull/8500
Closes https://github.com/espressif/esp-idf/issues/8499
Closes IDFGH-6879
Closes IDFGH-6881
2022-03-07 12:15:08 +05:30
morris
75e835efe6 Merge branch 'bugfix/fix_regi2c_analog_cali_num_macro' into 'master'
regi2c: fix analog calibration register num macro

See merge request espressif/esp-idf!17376
2022-03-07 14:08:47 +08:00
Sudeep Mohanty
a9fda54d39 esp_hw_support/esp_system: Re-evaluate header inclusions and include directories
This commit updates the visibility of various header files and cleans up
some unnecessary inclusions. Also, this commit removes certain header
include paths which were maintained for backward compatibility.
2022-03-07 11:18:08 +05:30
Konstantin Kondrashov
e17b0df8ec Merge branch 'feature/adds_efuses_to_table' into 'master'
efuse: Adds ERR_RST_ENABLE efuse for C3 and S3

See merge request espressif/esp-idf!17294
2022-03-07 13:05:55 +08:00
Armando
f41c9d154a regi2c: fix analog calibration register num macro 2022-03-07 11:48:57 +08:00
Kevin Guilloy
1fce1616c4 i2c: fix typo in SOC_I2C_SUPPORT_SALVE
Merges: https://github.com/espressif/esp-idf/pull/8513
2022-03-07 10:40:57 +08:00
Armando (Dou Yiwen)
748037708f Merge branch 'bugfix/fix_adc_digital_not_reset_issue' into 'master'
adc: fix adc digital part not reset issue

Closes IDF-4680

See merge request espressif/esp-idf!17279
2022-03-06 13:49:18 +08:00
wangjialiang
089637cfa3 ble_mesh: stack: Bugfix the proxy client abnormal disconnection 2022-03-05 11:14:28 +00:00
wangjialiang
c49b5b2409 ble_mesh: stack: Add proxy server connect and disconnect event 2022-03-05 11:14:28 +00:00
Vamshi Gajjela
964592e189 fatfs: Add trim ioctl call, set FF_USE_TRIM as default option.
FF_USE_TRIM is set by default with this commit. Fatfs invokes disk_ioctl
with CTRL_TRIM to erase the sectors calling sdmmc_erase_sectors to choose the right
argument for the erase operation based on media type.
2022-03-05 16:35:37 +05:30
Vamshi Gajjela
ffdbeee9f6 sdmmc: Add erase command-38. Support erase/trim/discard/sanitize
options.

Erase command (38) for SD cards allows option for erase/dicard/fule
operation at block level and for MMC cards supports option for
discard/trim at block level. When Sanitize is executed only the
portion of data that was unmapped by a Discard command shall be
removed by the Sanitize command.

Unit test cases added to verify ERASE feature in SD/SDSPI mode.
TRIM/DISCARD/SANITIZE tests for eMMC devices.

Closes https://github.com/espressif/esp-idf/pull/7635
Closes https://github.com/espressif/esp-idf/issues/7623
2022-03-05 16:02:01 +05:30
Armando (Dou Yiwen)
48daa38a63 Merge branch 'bugfix/fix_adc_calibration_light_sleep_issue' into 'master'
adc: fix calibration error when waking up from light sleep

Closes IDF-4406, IDF-4605, IDFGH-6252, and IDFGH-6651

See merge request espressif/esp-idf!16259
2022-03-04 23:05:09 +08:00
Martin Vychodil
9a5f39ec2c spi_flash: Linux target emulation of Partition API
Emulator of Partition API layer for Linux OS
2022-03-04 14:36:46 +00:00
Ivan Grokhotkov
c8b43ee0c1 Merge branch 'bugfix/sdspi_example_esp32s3' into 'master'
examples: sdspi: re-enable for ESP32-S3, add Kconfig options for pins

Closes IDF-4641

See merge request espressif/esp-idf!17067
2022-03-04 18:42:53 +08:00
morris
a0283234cd Merge branch 'feature/support_esp32h2_gpio' into 'master'
esp32h2: support GPIO peripheral, IO_MUX, GPIO matrix

Closes IDF-4232 and IDF-3439

See merge request espressif/esp-idf!16609
2022-03-04 18:22:28 +08:00
Cao Sen Miao
b248046bcb Temperature_sensor: Create new temperature sensor API 2022-03-04 18:13:35 +08:00
Cao Sen Miao
214e206111 Temperature_sensor: Add temperature support for ESP32-S3 2022-03-04 18:13:27 +08:00
Cao Sen Miao
441900caa2 Temperature_sensor: keep legacy drivers 2022-03-04 17:59:07 +08:00
Mahavir Jain
171b4ec13a Merge branch 'fix/update_licenses_of_file_wrt_mbedtls_3_1_change' into 'master'
mbedtls: Update licenses of files updated in mbedtls-3.1 update

Closes IDF-4725

See merge request espressif/esp-idf!17335
2022-03-04 13:55:11 +08:00
Jiang Jiang Jian
081828d494 Merge branch 'bugfix/add_pll_track_feature_mr_master' into 'master'
Add pll track feature

Closes BT-2030

See merge request espressif/esp-idf!17284
2022-03-04 13:53:59 +08:00
Aditya Patwardhan
4582af75b8 mbedtls: Update licenses of files updated in mbedtls-3.1 update 2022-03-04 05:18:58 +00:00
morris
52fcdbacc3 Merge branch 'feature/pcnt_driver_ng' into 'master'
 Driver-NG: Introduce a brand new driver for PCNT

Closes IDF-2196 and IDF-2896

See merge request espressif/esp-idf!10507
2022-03-04 12:25:35 +08:00
Armando
494b996ecc sleep: restore analog calibration registers after waking up from light sleep
Closes https://github.com/espressif/esp-idf/issues/8287
Closes https://github.com/espressif/esp-idf/issues/7921
2022-03-04 12:10:20 +08:00
Armando
d7512d8b38 adc: add adc single read & light sleep test 2022-03-04 12:10:20 +08:00
Omar Chebib
dc25a8a6ba Merge branch 'refactor_rtc_wdt_code' into 'master'
RTC WDT: refactor code to remove duplicated code

See merge request espressif/esp-idf!16845
2022-03-04 11:52:15 +08:00
Armando
e66f59ae0b rng: fix rng adc digital inpu not disabled issue 2022-03-04 03:49:33 +00:00
Armando
4ca115be98 adc: fix adc digital not reset issue 2022-03-04 03:49:33 +00:00
songruojing
c8c137f2b7 esp32h2: support GPIO peripheral, IO_MUX, GPIO matrix.
Generic GPIO example is supported as well.
2022-03-04 11:25:05 +08:00
Ivan Grokhotkov
6b8e4212be
driver: sdspi: set default DMA channel compatible with S3, C3 or later 2022-03-03 21:40:04 +01:00
Ivan Grokhotkov
c19203be0e
mbedtls: disable files generation, specify Python interpreter to use
When GEN_FILES is enabled, Perl interpreter should be available. There
is a check in mbedTLS that disables GEN_FILES on Windows (where Perl
is not available by default) but it is broken for recent CMake
versions.

Also set Python interpreter to the one IDF uses, just to avoid calling
into some other Python version which CMake might manage to find.
2022-03-03 15:56:15 +01:00
morris
0d920a47f7 unit_test: migrate to use pulse_cnt driver 2022-03-03 22:38:32 +08:00
morris
04b3f8b210 pcnt: deprecated as legacy driver 2022-03-03 22:38:32 +08:00
morris
ec8defaa96 pulse_cnt: new driver for PCNT peripheral 2022-03-03 22:38:32 +08:00
Jiang Jiang Jian
1068c7720b Merge branch 'bugfix/ignore_pmf_capable_flag' into 'master'
Always connect Station in PMF mode if possible

Closes WIFI-4320

See merge request espressif/esp-idf!17023
2022-03-03 19:34:36 +08:00
Sudeep Mohanty
bc82613847 Merge branch 'docs/ulp_documentation_updates' into 'master'
docs: Updated ULP documentation

Closes IDF-3306

See merge request espressif/esp-idf!17225
2022-03-03 19:16:27 +08:00
Alex Lisitsyn
dcaac79380 Merge branch 'bugfix/modbus_fix_start_after_destroy_issues' into 'master'
modbus: fix tcp slave destroy issues

Closes IDFGH-6568

See merge request espressif/esp-idf!16856
2022-03-03 16:34:33 +08:00
Alex Lisitsyn
224901fed3 modbus: fix tcp slave destroy issues 2022-03-03 16:34:33 +08:00
Song Ruo Jing
ed3469ea65 Merge branch 'bugfix/i2c_iram_placement_fix' into 'master'
i2c: Correct hal functions iram placement

Closes IDFGH-6795

See merge request espressif/esp-idf!17282
2022-03-03 16:19:31 +08:00
Yang Zhao
000f398ab9 Update ESP32-C3 and ESP32-S3 bt lib and phy lib
Add the pll track feature to keep the ble connection stable when the environment
temprature increase form 0 to 74.
2022-03-03 07:39:22 +00:00
Omar Chebib
96b362d1da RTC WDT: Use target name instead of caps for rtc wdt 2022-03-03 13:47:22 +08:00