Commit f571da05 authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Peter Zijlstra

lkdtm/stackleak: Fix noinstr violation

Fixes the following warning:

  vmlinux.o: warning: objtool: check_stackleak_irqoff+0x2b6: call to _printk() leaves .noinstr.text section
Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/ee5209f53aa0a62aea58be18f2b78b17606779a6.1681320026.git.jpoimboe@kernel.org
parent e0b081d1
...@@ -43,12 +43,14 @@ static void noinstr check_stackleak_irqoff(void) ...@@ -43,12 +43,14 @@ static void noinstr check_stackleak_irqoff(void)
* STACK_END_MAGIC, and in either casee something is seriously wrong. * STACK_END_MAGIC, and in either casee something is seriously wrong.
*/ */
if (current_sp < task_stack_low || current_sp >= task_stack_high) { if (current_sp < task_stack_low || current_sp >= task_stack_high) {
instrumentation_begin();
pr_err("FAIL: current_stack_pointer (0x%lx) outside of task stack bounds [0x%lx..0x%lx]\n", pr_err("FAIL: current_stack_pointer (0x%lx) outside of task stack bounds [0x%lx..0x%lx]\n",
current_sp, task_stack_low, task_stack_high - 1); current_sp, task_stack_low, task_stack_high - 1);
test_failed = true; test_failed = true;
goto out; goto out;
} }
if (lowest_sp < task_stack_low || lowest_sp >= task_stack_high) { if (lowest_sp < task_stack_low || lowest_sp >= task_stack_high) {
instrumentation_begin();
pr_err("FAIL: current->lowest_stack (0x%lx) outside of task stack bounds [0x%lx..0x%lx]\n", pr_err("FAIL: current->lowest_stack (0x%lx) outside of task stack bounds [0x%lx..0x%lx]\n",
lowest_sp, task_stack_low, task_stack_high - 1); lowest_sp, task_stack_low, task_stack_high - 1);
test_failed = true; test_failed = true;
...@@ -86,11 +88,14 @@ static void noinstr check_stackleak_irqoff(void) ...@@ -86,11 +88,14 @@ static void noinstr check_stackleak_irqoff(void)
if (*(unsigned long *)poison_low == STACKLEAK_POISON) if (*(unsigned long *)poison_low == STACKLEAK_POISON)
continue; continue;
instrumentation_begin();
pr_err("FAIL: non-poison value %lu bytes below poison boundary: 0x%lx\n", pr_err("FAIL: non-poison value %lu bytes below poison boundary: 0x%lx\n",
poison_high - poison_low, *(unsigned long *)poison_low); poison_high - poison_low, *(unsigned long *)poison_low);
test_failed = true; test_failed = true;
goto out;
} }
instrumentation_begin();
pr_info("stackleak stack usage:\n" pr_info("stackleak stack usage:\n"
" high offset: %lu bytes\n" " high offset: %lu bytes\n"
" current: %lu bytes\n" " current: %lu bytes\n"
...@@ -113,6 +118,7 @@ static void noinstr check_stackleak_irqoff(void) ...@@ -113,6 +118,7 @@ static void noinstr check_stackleak_irqoff(void)
} else { } else {
pr_info("OK: the rest of the thread stack is properly erased\n"); pr_info("OK: the rest of the thread stack is properly erased\n");
} }
instrumentation_end();
} }
static void lkdtm_STACKLEAK_ERASING(void) static void lkdtm_STACKLEAK_ERASING(void)
......
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