Skip to contentSkip to conversation

lkdtm: isolate stack corruption test

PATCH New Kees Cook 1 participant 1 message Oct 25, 2013 Char and misc drivers

lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 lkdtm: isolate stack corruption test

When tests were added to lkdtm that grew the stack frame, the stack corruption test stopped working. This isolates the test in its own function, and forces it not to be inlined.

Fixes cc33c537c12f ("lkdtm: add "EXEC_*" triggers")

---
This bug was introduced in 3.12, so it'd be nice to get it fixed there too. But if misses it, I'm likely the only person to notice. And in that case, it should go into stable for 3.12.

---
 drivers/misc/lkdtm.c |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/misc/lkdtm.c +10 -6
index 2fc0586ce3bb..9cbd0370ca44 100644
@@ -297,6 +297,14 @@ static void do_nothing(void)
 	return;
 }
 
+static noinline void corrupt_stack(void)
+{
+	/* Use default char array length that triggers stack protection. */
+	char data[8];
+
+	memset((void *)data, 0, 64);
+}
+
 static void execute_location(void *dst)
 {
 	void (*func)(void) = dst;
@@ -327,13 +335,9 @@ static void lkdtm_do_action(enum ctype which)
 	case CT_OVERFLOW:
 		(void) recursive_loop(0);
 		break;
-	case CT_CORRUPT_STACK: {
-		/* Make sure the compiler creates and uses an 8 char array. */
-		volatile char data[8];
-
-		memset((void *)data, 0, 64);
+	case CT_CORRUPT_STACK:
+		corrupt_stack();
 		break;
-	}
 	case CT_UNALIGNED_LOAD_STORE_WRITE: {
 		static u8 data[5] __attribute__((aligned(4))) = {1, 2,
 				3, 4, 5};
Signature · 6 lines
1.7.9.5


-- 
Kees Cook
Chrome OS Security