michaelh/zephyr
1
0
Fork 0
Code Releases Activity

kernel: Unified type of stack protection canary __stack_chk_guard.

Browse source 
Extern declaration of __stack_chk_guard added volatile to
the type while the declaration was non-volatile. This cause
type check errors with compilers that declares the
__stack_chk_guard variable in an internal pre-include
header file (IAR).

While I think the volatile keyword is unnecessary, I decided
on keep it and add it to the declaration in
kernel/compiler_stack_protect.c

Tested with IAR ICCARM and the Zephyr SDK GCC.

Signed-off-by: Lars-Ove Karlsson <lars-ove.karlsson@iar.com>
This commit is contained in:
Lars-Ove Karlsson 2024-06-12 12:51:21 +02:00 • committed by Alberto Escolar
commit 25cdda10e1
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
kernel/compiler_stack_protect.c
View file

@ -47,11 +47,11 @@ void _StackCheckHandler(void)
* The canary value gets initialized in z_cstart().
*/
#ifdef CONFIG_STACK_CANARIES_TLS
__thread uintptr_t __stack_chk_guard;
__thread volatile uintptr_t __stack_chk_guard;
#elif CONFIG_USERSPACE
K_APP_DMEM(z_libc_partition) uintptr_t __stack_chk_guard;
K_APP_DMEM(z_libc_partition) volatile uintptr_t __stack_chk_guard;
#else
__noinit uintptr_t __stack_chk_guard;
__noinit volatile uintptr_t __stack_chk_guard;
#endif
/**