Commit 88959a39 authored by Mark Rutland's avatar Mark Rutland Committed by Kees Cook
Browse files

arm64: entry: use stackleak_erase_on_task_stack() 



On arm64 we always call stackleak_erase() on a task stack, and never
call it on another stack. We can avoid some redundant work by using
stackleak_erase_on_task_stack(), telling the stackleak code that it's
being called on a task stack.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Cc: Alexander Popov <alex.popov@linux.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Will Deacon <will@kernel.org>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20220427173128.2603085-14-mark.rutland@arm.com
parent 8111e67d

arch/arm64/kernel/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -596,7 +596,7 @@ SYM_CODE_START_LOCAL(ret_to_user) 
	ldr	x19, [tsk, #TSK_TI_FLAGS]	// re-check for single-step

	enable_step_tsk x19, x2

#ifdef CONFIG_GCC_PLUGIN_STACKLEAK

	bl	stackleak_erase

	bl	stackleak_erase_on_task_stack

#endif

	kernel_exit 0

SYM_CODE_END(ret_to_user)