shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

lkdtm/stackleak: Fix noinstr violation

Browse Source 
[ Upstream commit f571da059f ]

Fixes the following warning:

  vmlinux.o: warning: objtool: check_stackleak_irqoff+0x2b6: call to _printk() leaves .noinstr.text section

Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/ee5209f53aa0a62aea58be18f2b78b17606779a6.1681320026.git.jpoimboe@kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Josh Poimboeuf
2023-04-12 10:24:08 -07:00
committed by Greg Kroah-Hartman
parent fa825017fb
commit 4e2df91118
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/misc/lkdtm/stackleak.c
View File

@@ -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)
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 @@ out:
} 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)