lkdtm: add test for executing .rodata
PATCH v2 1/1 lkdtm: add test for executing .rodata
Make sure that the read-only data section isn't executable. To avoid making per-architecture assembly functions, just mark the new function as living in the .rodata section and force the flags (which requires adding a comment to hide the generated flags from the assembler).
---
v2:
- fix the section bits hack to be more friendly
--- drivers/misc/lkdtm.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-)
drivers/misc/lkdtm.c +21 -7
@@ -100,6 +100,7 @@ enum ctype {CT_EXEC_STACK ,CT_EXEC_KMALLOC ,CT_EXEC_VMALLOC , +CT_EXEC_RODATA ,CT_EXEC_USERSPACE ,CT_ACCESS_USERSPACE , CT_WRITE_RO,
@@ -137,6 +138,7 @@ static char* cp_type[] = {"EXEC_STACK" ,"EXEC_KMALLOC" ,"EXEC_VMALLOC" , +"EXEC_RODATA" ,"EXEC_USERSPACE" ,"ACCESS_USERSPACE" , "WRITE_RO",
@@ -315,6 +317,12 @@ static int recursive_loop(int remaining)return recursive_loop (remaining -1 ); } +static void __attribute__((__section__ (".rodata,\"a\",\%progbits;//" ))) +do_nothing_rodata (void ) +{ +return ; +} +static void do_nothing (void ) {return ;
@@ -335,15 +343,18 @@ static noinline void corrupt_stack(void)memset ((void *)data,0 ,64 ); } -static void execute_location (void *dst) +static void execute_location (void *dst,bool write) {void (*func)(void ) = dst;pr_info ("attempting ok execution at %p\n" , do_nothing);do_nothing (); -memcpy (dst, do_nothing,EXEC_SIZE ); -flush_icache_range ((unsigned long )dst, (unsigned long )dst +EXEC_SIZE ); +if (write) { +memcpy (dst, do_nothing,EXEC_SIZE ); +flush_icache_range ((unsigned long )dst, + (unsigned long )dst +EXEC_SIZE ); + }pr_info ("attempting bad execution at %p\n" , func);func (); }
@@ -438,25 +449,28 @@ static void lkdtm_do_action(enum ctype which)schedule ();break ;case CT_EXEC_DATA : -execute_location (data_area); +execute_location (data_area, true);break ;case CT_EXEC_STACK : {u8 stack_area[EXEC_SIZE ]; -execute_location (stack_area); +execute_location (stack_area, true);break ; }case CT_EXEC_KMALLOC : {u32 *kmalloc_area =kmalloc (EXEC_SIZE ,GFP_KERNEL ); -execute_location (kmalloc_area); +execute_location (kmalloc_area, true);kfree (kmalloc_area);break ; }case CT_EXEC_VMALLOC : {u32 *vmalloc_area =vmalloc (EXEC_SIZE ); -execute_location (vmalloc_area); +execute_location (vmalloc_area, true);vfree (vmalloc_area);break ; } +case CT_EXEC_RODATA : +execute_location (do_nothing_rodata, false); +break ;case CT_EXEC_USERSPACE : {unsigned long user_addr;
Signature · 6 lines
2.6.3 -- Kees Cook Chrome OS & Brillo Security
Quoted 34 lines · Kees Cook
Make sure that the read-only data section isn't executable. To avoid making per-architecture assembly functions, just mark the new function as living in the .rodata section and force the flags (which requires adding a comment to hide the generated flags from the assembler).
Signed-off-by Kees Cook <[email protected]>---
v2:
- fix the section bits hack to be more friendly--- drivers/misc/lkdtm.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-)drivers/misc/lkdtm.c +2
-0@@ -100,6 +100,7 @@ enum ctype {CT_EXEC_STACK ,CT_EXEC_KMALLOC ,CT_EXEC_VMALLOC , +CT_EXEC_RODATA ,CT_EXEC_USERSPACE ,CT_ACCESS_USERSPACE , CT_WRITE_RO,@@ -137,6 +138,7 @@ static char* cp_type[] = {"EXEC_STACK" ,"EXEC_KMALLOC" ,"EXEC_VMALLOC" , +"EXEC_RODATA" ,"EXEC_USERSPACE" ,"ACCESS_USERSPACE" , "WRITE_RO",
drivers/misc/lkdtm.c static int recursive_loop(int remaining) · line 320
Quoted 4 lines
drivers/misc/lkdtm.c +1
-0@@ -315,6 +317,12 @@ static int recursive_loop(int remaining)return recursive_loop (remaining -1 ); } +static void __attribute__((__section__(".rodata,\"a\",\%progbits;//")))
Aaaand, nope. This fails on sparc, which doesn't know what "/" is. Wheee. I might need to add a set of tests to compiler.h and include the arch-specific comment character with a #define.
-Kees
Quoted 70 lines
drivers/misc/lkdtm.c +18
-8+do_nothing_rodata (void) +{ +return ; +} +static void do_nothing (void ) {return ;@@ -335,15 +343,18 @@ static noinline void corrupt_stack(void)memset ((void *)data,0 ,64 ); } -static void execute_location (void *dst) +static void execute_location (void *dst,bool write) {void (*func)(void ) = dst;pr_info ("attempting ok execution at %p\n" , do_nothing);do_nothing (); -memcpy (dst, do_nothing,EXEC_SIZE ); -flush_icache_range ((unsigned long )dst, (unsigned long )dst +EXEC_SIZE ); +if (write) { +memcpy (dst, do_nothing,EXEC_SIZE ); +flush_icache_range ((unsigned long )dst, + (unsigned long )dst +EXEC_SIZE ); + }pr_info ("attempting bad execution at %p\n" , func);func (); }@@ -438,25 +449,28 @@ static void lkdtm_do_action(enum ctype which)schedule ();break ;case CT_EXEC_DATA : -execute_location (data_area); +execute_location (data_area, true);break ;case CT_EXEC_STACK : {u8 stack_area[EXEC_SIZE ]; -execute_location (stack_area); +execute_location (stack_area, true);break ; }case CT_EXEC_KMALLOC : {u32 *kmalloc_area =kmalloc (EXEC_SIZE ,GFP_KERNEL ); -execute_location (kmalloc_area); +execute_location (kmalloc_area, true);kfree (kmalloc_area);break ; }case CT_EXEC_VMALLOC : {u32 *vmalloc_area =vmalloc (EXEC_SIZE ); -execute_location (vmalloc_area); +execute_location (vmalloc_area, true);vfree (vmalloc_area);break ; } +case CT_EXEC_RODATA : +execute_location (do_nothing_rodata, false); +break ;case CT_EXEC_USERSPACE : {unsigned long user_addr; --2.6.3
--
Kees Cook
Chrome OS & Brillo Security
Signature · 2 lines
Kees Cook Chrome OS & Brillo Security
Quoted 9 lines · Kees Cook
Make sure that the read-only data section isn't executable. To avoid making per-architecture assembly functions, just mark the new function as living in the .rodata section and force the flags (which requires adding a comment to hide the generated flags from the assembler).
Signed-off-by Kees Cook <[email protected]>---
v2:
- fix the section bits hack to be more friendly
This is producing different assembler errors:
CC drivers/misc/lkdtm.o/tmp/ccAJjNlS.s: Assembler messages:/tmp/ccAJjNlS.s: Error: unaligned opcodes detected in executable segment scripts/Makefile.build:258: recipe for target 'drivers/misc/lkdtm.o' failed
Doesn't seem to be toolchain dependent as I see it with two different ones
$ /opt/gcc-linaro-5.1-2015.08-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-as --version GNU assembler (GNU Binutils) 2.25.0 Linaro 2015.10
$ aarch64-linux-gnu-as --version GNU assembler version 2.26.20160125
The latter is the toolchain from Fedora 23.
Sticking an extra align directive in there doesn't seem to help. Playing around a bit, this works if I don't have debuginfo turned on. Possible gcc issue where something is not being calculated correctly or gcc working as intended?
Thanks,
Laura
Quoted 93 lines
--- drivers/misc/lkdtm.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-)drivers/misc/lkdtm.c +21
-7@@ -100,6 +100,7 @@ enum ctype {CT_EXEC_STACK ,CT_EXEC_KMALLOC ,CT_EXEC_VMALLOC , +CT_EXEC_RODATA ,CT_EXEC_USERSPACE ,CT_ACCESS_USERSPACE , CT_WRITE_RO,@@ -137,6 +138,7 @@ static char* cp_type[] = {"EXEC_STACK" ,"EXEC_KMALLOC" ,"EXEC_VMALLOC" , +"EXEC_RODATA" ,"EXEC_USERSPACE" ,"ACCESS_USERSPACE" , "WRITE_RO",@@ -315,6 +317,12 @@ static int recursive_loop(int remaining)return recursive_loop (remaining -1 ); } +static void __attribute__((__section__ (".rodata,\"a\",\%progbits;//" ))) +do_nothing_rodata (void ) +{ +return ; +} +static void do_nothing (void ) {return ;@@ -335,15 +343,18 @@ static noinline void corrupt_stack(void)memset ((void *)data,0 ,64 ); } -static void execute_location (void *dst) +static void execute_location (void *dst,bool write) {void (*func)(void ) = dst;pr_info ("attempting ok execution at %p\n" , do_nothing);do_nothing (); -memcpy (dst, do_nothing,EXEC_SIZE ); -flush_icache_range ((unsigned long )dst, (unsigned long )dst +EXEC_SIZE ); +if (write) { +memcpy (dst, do_nothing,EXEC_SIZE ); +flush_icache_range ((unsigned long )dst, + (unsigned long )dst +EXEC_SIZE ); + }pr_info ("attempting bad execution at %p\n" , func);func (); }@@ -438,25 +449,28 @@ static void lkdtm_do_action(enum ctype which)schedule ();break ;case CT_EXEC_DATA : -execute_location (data_area); +execute_location (data_area, true);break ;case CT_EXEC_STACK : {u8 stack_area[EXEC_SIZE ]; -execute_location (stack_area); +execute_location (stack_area, true);break ; }case CT_EXEC_KMALLOC : {u32 *kmalloc_area =kmalloc (EXEC_SIZE ,GFP_KERNEL ); -execute_location (kmalloc_area); +execute_location (kmalloc_area, true);kfree (kmalloc_area);break ; }case CT_EXEC_VMALLOC : {u32 *vmalloc_area =vmalloc (EXEC_SIZE ); -execute_location (vmalloc_area); +execute_location (vmalloc_area, true);vfree (vmalloc_area);break ; } +case CT_EXEC_RODATA : +execute_location (do_nothing_rodata, false); +break ;case CT_EXEC_USERSPACE : {unsigned long user_addr;