alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'feat/c5_basic_pma' into 'master'

Browse Source 
feat(cpu): add basic PMA protection for null access

See merge request espressif/esp-idf!30803
This commit is contained in:
Marius Vikhammer 2024-05-14 10:06:18 +08:00
commit 6245159dcc
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/esp_hw_support/port/esp32c5/cpu_region_protect.c
View File

@ -70,7 +70,13 @@ static void esp_cpu_configure_invalid_regions(void)
void esp_cpu_configure_region_protection(void) void esp_cpu_configure_region_protection(void)
{ {
// ROM has configured the MSPI region with RX permission, we should add W attribute for psram // ROM has configured the MSPI region with RX permission, we should add W attribute for psram
PMA_ENTRY_SET_NAPOT(0, SOC_IROM_LOW, (SOC_IROM_HIGH - SOC_IROM_LOW), PMA_NAPOT | PMA_L | PMA_EN | PMA_R | PMA_W | PMA_X); PMA_ENTRY_SET_NAPOT(0, SOC_IROM_LOW, (SOC_IROM_HIGH - SOC_IROM_LOW), PMA_NAPOT | PMA_EN | PMA_R | PMA_W | PMA_X);
// Configure just the area around 0x0 for now so that we at least get exceptions for
// writes/reads to NULL pointers, as well as code that relies on writes to 0x0
// to abort/assert
PMA_ENTRY_SET_NAPOT(1, 0, SOC_DEBUG_LOW, PMA_NAPOT | PMA_EN);
return; return;
/* Notes on implementation: /* Notes on implementation:
* *