riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #14821 from bergzand/pr/cortexm_common/enable_mpu_after_config

Browse Source 
cortexm_common: Enable MPU after configuring regions
This commit is contained in:
Koen Zandberg 2020-08-23 18:02:40 +02:00 committed by GitHub
commit 659c351c02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cpu/cortexm_common/vectors_cortexm.c
View File

@ -140,10 +140,6 @@ void reset_handler_default(void)
} }
#endif /* CPU_HAS_BACKUP_RAM */ #endif /* CPU_HAS_BACKUP_RAM */
#if defined(MODULE_MPU_STACK_GUARD) || defined(MODULE_MPU_NOEXEC_RAM)
mpu_enable();
#endif
#ifdef MODULE_MPU_NOEXEC_RAM #ifdef MODULE_MPU_NOEXEC_RAM
/* Mark the RAM non executable. This is a protection mechanism which /* Mark the RAM non executable. This is a protection mechanism which
* makes exploitation of buffer overflows significantly harder. * makes exploitation of buffer overflows significantly harder.
@ -169,6 +165,10 @@ void reset_handler_default(void)
} }
#endif #endif
#if defined(MODULE_MPU_STACK_GUARD) || defined(MODULE_MPU_NOEXEC_RAM)
mpu_enable();
#endif
post_startup(); post_startup();
/* initialize the board (which also initiates CPU initialization) */ /* initialize the board (which also initiates CPU initialization) */