alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-31 14:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(security): Fixed ESP32S2 memory protection check for Peri1 RTCSLOW interrupt

Browse Source 
- fixes the issue found in https://github.com/espressif/esp-idf/issues/15359
- extends debug printouts in the related tests
This commit is contained in:
Martin Vychodil
2025-02-19 09:42:57 +01:00
parent 04133e0225
commit 64ae64fb16
3 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/hal/esp32s2/include/hal/memprot_peri_ll.h
View File

@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2020-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -112,7 +112,7 @@ static inline intptr_t memprot_ll_peri1_rtcslow_get_fault_address(void)
static inline bool memprot_ll_peri1_rtcslow_is_intr_mine(void)
{
if (memprot_ll_dram0_is_assoc_intr()) {
if (memprot_ll_peri1_is_assoc_intr()) {
uint32_t faulting_address = (uint32_t)memprot_ll_peri1_rtcslow_get_fault_address();
return faulting_address >= PERI1_RTCSLOW_ADDRESS_LOW && faulting_address <= PERI1_RTCSLOW_ADDRESS_HIGH;
}
@@ -123,7 +123,7 @@ static inline memprot_hal_err_t memprot_ll_peri1_rtcslow_set_prot(uint32_t *spli
{
uint32_t addr = (uint32_t)split_addr;
//check corresponding range fit & aligment to 32bit boundaries
//check corresponding range fit & alignment to 32bit boundaries
if (addr < PERI1_RTCSLOW_ADDRESS_LOW || addr > PERI1_RTCSLOW_ADDRESS_HIGH) {
return MEMP_HAL_ERR_SPLIT_ADDR_INVALID;
}
@@ -281,7 +281,7 @@ static inline memprot_hal_err_t memprot_ll_peri2_rtcslow_0_set_prot(uint32_t *sp
{
uint32_t addr = (uint32_t)split_addr;
//check corresponding range fit & aligment to 32bit boundaries
//check corresponding range fit & alignment to 32bit boundaries
if (addr < PERI2_RTCSLOW_0_ADDRESS_LOW || addr > PERI2_RTCSLOW_0_ADDRESS_HIGH) {
return MEMP_HAL_ERR_SPLIT_ADDR_INVALID;
}
@@ -369,7 +369,7 @@ static inline memprot_hal_err_t memprot_ll_peri2_rtcslow_1_set_prot(uint32_t *sp
{
uint32_t addr = (uint32_t)split_addr;
//check corresponding range fit & aligment to 32bit boundaries
//check corresponding range fit & alignment to 32bit boundaries
if (addr < PERI2_RTCSLOW_1_ADDRESS_LOW || addr > PERI2_RTCSLOW_1_ADDRESS_HIGH) {
return MEMP_HAL_ERR_SPLIT_ADDR_INVALID;
}