From 6ec747105bfa8d52aca77bc577268f1944b19585 Mon Sep 17 00:00:00 2001 From: Michal Idziorek Date: Tue, 25 Nov 2014 12:22:35 +0100 Subject: started adding stack shmashing protection --- kernel/kernel.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'kernel/kernel.c') diff --git a/kernel/kernel.c b/kernel/kernel.c index 59ad130..77970c3 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -31,6 +31,27 @@ #include "task.h" +#include +#include + + +// CODE FOR Stack Smashing Protector, TODO: MOVE / and do not duplicate +// with sys.c +// http://wiki.osdev.org/Stack_Smashing_Protector + +#if UINT32_MAX == UINTPTR_MAX +#define STACK_CHK_GUARD 0xe2dee396 +#else +#define STACK_CHK_GUARD 0x595e9fbd94fda766 +#endif + +uintptr_t __stack_chk_guard = STACK_CHK_GUARD; + +__attribute__((noreturn)) +void __stack_chk_fail(void) +{ + panic(FOOLOS_MODULE_NAME,"Stack smashing detected"); +} // mp informs us if this if this is the main processor void kernel_main(uint32_t initial_stack, int mp) -- cgit v1.2.3