michaelh/zephyr
1
0
Fork 0
Code Releases Activity

debug: add stack sentinel feature

Browse source 
This places a sentinel value at the lowest 4 bytes of a stack
memory region and checks it at various intervals, including when
servicing interrupts or context switching.

This is implemented on all arches except ARC, which supports stack
bounds checking directly in hardware.

Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
Andrew Boie 2017-05-11 13:29:15 -07:00 • committed by Anas Nashif
commit 5dcb279df8
19 changed files with 162 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
arch/arm/core/exc_exit.S
View file

@ -103,4 +103,15 @@ _ExcExitWithGdbStub:
_EXIT_EXC:
#endif /* CONFIG_PREEMPT_ENABLED */
#ifdef CONFIG_STACK_SENTINEL
push {lr}
bl _check_stack_sentinel
#if defined(CONFIG_ARMV6_M)
pop {r0}
mov lr, r0
#else
pop {lr}
#endif /* CONFIG_ARMV6_M */
#endif /* CONFIG_STACK_SENTINEL */
bx lr

2
arch/arm/core/fatal.c
View file

@ -50,7 +50,7 @@ void _NanoFatalErrorHandler(unsigned int reason,
printk("***** Invalid Exit Software Error! *****\n");
break;
#if defined(CONFIG_STACK_CANARIES)
#if defined(CONFIG_STACK_CANARIES) || defined(CONFIG_STACK_SENTINEL)
case _NANO_ERR_STACK_CHK_FAIL:
printk("***** Stack Check Fail! *****\n");
break;

21
arch/arm/core/swap.S
View file

@ -47,13 +47,24 @@ GDATA(_kernel)
SECTION_FUNC(TEXT, __pendsv)
#if defined (CONFIG_KERNEL_EVENT_LOGGER_CONTEXT_SWITCH) || \
defined(CONFIG_STACK_SENTINEL)
/* Register the context switch */
push {lr}
#ifdef CONFIG_KERNEL_EVENT_LOGGER_CONTEXT_SWITCH
/* Register the context switch */
push {lr}
bl _sys_k_event_logger_context_switch
pop {r0}
mov lr, r0
bl _sys_k_event_logger_context_switch
#endif
#ifdef CONFIG_STACK_SENTINEL
bl _check_stack_sentinel
#endif
#if defined(CONFIG_ARMV6_M)
pop {r0}
mov lr, r0
#else
pop {lr}
#endif /* CONFIG_ARMV6_M */
#endif /* CONFIG_KERNEL_EVENT_LOGGER_CONTEXT_SWITCH || CONFIG_STACK_SENTINEL */
/* load _kernel into r1 and current k_thread into r2 */
ldr r1, =_kernel