Commit dc2b9e90 authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman

lkdtm: add "WRITE_KERN" test

Add "WRITE_KERN" crash target to validate that kernel executable memory
is not writable.
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent aac416fc
...@@ -102,6 +102,7 @@ enum ctype { ...@@ -102,6 +102,7 @@ enum ctype {
CT_EXEC_USERSPACE, CT_EXEC_USERSPACE,
CT_ACCESS_USERSPACE, CT_ACCESS_USERSPACE,
CT_WRITE_RO, CT_WRITE_RO,
CT_WRITE_KERN,
}; };
static char* cp_name[] = { static char* cp_name[] = {
...@@ -138,6 +139,7 @@ static char* cp_type[] = { ...@@ -138,6 +139,7 @@ static char* cp_type[] = {
"EXEC_USERSPACE", "EXEC_USERSPACE",
"ACCESS_USERSPACE", "ACCESS_USERSPACE",
"WRITE_RO", "WRITE_RO",
"WRITE_KERN",
}; };
static struct jprobe lkdtm; static struct jprobe lkdtm;
...@@ -317,6 +319,13 @@ static void do_nothing(void) ...@@ -317,6 +319,13 @@ static void do_nothing(void)
return; return;
} }
/* Must immediately follow do_nothing for size calculuations to work out. */
static void do_overwritten(void)
{
pr_info("do_overwritten wasn't overwritten!\n");
return;
}
static noinline void corrupt_stack(void) static noinline void corrupt_stack(void)
{ {
/* Use default char array length that triggers stack protection. */ /* Use default char array length that triggers stack protection. */
...@@ -496,6 +505,22 @@ static void lkdtm_do_action(enum ctype which) ...@@ -496,6 +505,22 @@ static void lkdtm_do_action(enum ctype which)
break; break;
} }
case CT_WRITE_KERN: {
size_t size;
unsigned char *ptr;
size = (unsigned long)do_overwritten -
(unsigned long)do_nothing;
ptr = (unsigned char *)do_overwritten;
pr_info("attempting bad %zu byte write at %p\n", size, ptr);
memcpy(ptr, (unsigned char *)do_nothing, size);
flush_icache_range((unsigned long)ptr,
(unsigned long)(ptr + size));
do_overwritten();
break;
}
case CT_NONE: case CT_NONE:
default: default:
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment