LoongArch: Enable HAVE_ARCH_STACKLEAK
PATCH v2 1/1 LoongArch: Enable HAVE_ARCH_STACKLEAK
From: Youling Tang <[email protected]>
Add support for the stackleak feature. It initialize the stack with the poison value before returning from system calls which improves the kernel security.
At the same time, disables the plugin in EFI stub code because EFI stub is out of scope for the protection.
Tested on 3A5000 (enable CONFIG_GCC_PLUGIN_STACKLEAK and CONFIG_LKDTM):
# echo STACKLEAK_ERASING > /sys/kernel/debug/provoke-crash/DIRECT
# dmesg
lkdtm: Performing direct entry STACKLEAK_ERASING
lkdtm: stackleak stack usage:
high offset: 320 bytes
current: 448 bytes
lowest: 1264 bytes
tracked: 1264 bytes
untracked: 208 bytes
poisoned: 14528 bytes
low offset: 64 bytes
lkdtm: OK: the rest of the thread stack is properly erased---
v2:
* Make on_thread_stack() __always_inline.
* Move the STACKLEAK_ERASE macro to the stackframe.h file.
arch/loongarch/Kconfig | 1 + arch/loongarch/include/asm/entry-common.h | 8 +------- arch/loongarch/include/asm/stackframe.h | 6 ++++++ arch/loongarch/include/asm/stacktrace.h | 5 +++++ arch/loongarch/kernel/entry.S | 3 +++ drivers/firmware/efi/libstub/Makefile | 2 +- 6 files changed, 17 insertions(+), 8 deletions(-)
arch/loongarch/Kconfig +1 -0
@@ -122,6 +122,7 @@ config LOONGARCH select HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET select HAVE_ARCH_SECCOMP select HAVE_ARCH_SECCOMP_FILTER + select HAVE_ARCH_STACKLEAK select HAVE_ARCH_TRACEHOOK select HAVE_ARCH_TRANSPARENT_HUGEPAGE select HAVE_ARCH_USERFAULTFD_MINOR if USERFAULTFD
arch/loongarch/include/asm/entry-common.h +1 -7
@@ -2,12 +2,6 @@#ifndef ARCH_LOONGARCH_ENTRY_COMMON_H #define ARCH_LOONGARCH_ENTRY_COMMON_H -#include <linux/sched.h> -#include <linux/processor.h> - -static inline bool on_thread_stack (void ) -{ -return !(((unsigned long )(current->stack) ^ current_stack_pointer) & ~(THREAD_SIZE -1 )); -} +#include <asm/stacktrace.h> #endif
arch/loongarch/include/asm/stackframe.h +6 -0
@@ -243,4 +243,10 @@ RESTORE_SP_AND_RET \docfi .endm + .macro STACKLEAK_ERASE +#ifdef CONFIG_GCC_PLUGIN_STACKLEAK + bl stackleak_erase_on_task_stack +#endif + .endm +#endif /* _ASM_STACKFRAME_H */
arch/loongarch/include/asm/stacktrace.h +5 -0
@@ -31,6 +31,11 @@ bool in_irq_stack(unsigned long stack, struct stack_info *info);bool in_task_stack (unsigned long stack,struct task_struct *task,struct stack_info *info);int get_stack_info (unsigned long stack,struct task_struct *task,struct stack_info *info); +static __always_inline bool on_thread_stack(void) +{ +return !(((unsigned long )(current->stack) ^ current_stack_pointer) & ~(THREAD_SIZE -1 )); +} +#define STR_LONG_L __stringify(LONG_L)#define STR_LONG_S __stringify(LONG_S)#define STR_LONGSIZE __stringify(LONGSIZE)
arch/loongarch/kernel/entry.S +3 -0
@@ -73,6 +73,7 @@ SYM_CODE_START(handle_syscall) move a0, sp bl do_syscall + STACKLEAK_ERASE RESTORE_ALL_AND_RET SYM_CODE_END(handle_syscall) _ASM_NOKPROBE(handle_syscall)
@@ -82,6 +83,7 @@ SYM_CODE_START(ret_from_fork) bl schedule_tail # a0 = struct task_struct *prev move a0, sp bl syscall_exit_to_user_mode + STACKLEAK_ERASE RESTORE_STATIC RESTORE_SOME RESTORE_SP_AND_RET
@@ -94,6 +96,7 @@ SYM_CODE_START(ret_from_kernel_thread) jirl ra, s0, 0 move a0, sp bl syscall_exit_to_user_mode + STACKLEAK_ERASE RESTORE_STATIC RESTORE_SOME RESTORE_SP_AND_RET
drivers/firmware/efi/libstub/Makefile +1 -1
@@ -31,7 +31,7 @@ cflags-$(CONFIG_ARM) += -DEFI_HAVE_STRLEN -DEFI_HAVE_STRNLEN \ $(DISABLE_STACKLEAK_PLUGIN) cflags-$(CONFIG_RISCV) += -fpic -DNO_ALTERNATIVE -mno-relax \ $(DISABLE_STACKLEAK_PLUGIN) -cflags-$(CONFIG_LOONGARCH) += -fpie +cflags-$(CONFIG_LOONGARCH) += -fpie $(DISABLE_STACKLEAK_PLUGIN) cflags-$(CONFIG_EFI_PARAMS_FROM_FDT) += -I$(srctree)/scripts/dtc/libfdt
Signature · 1 line
2.38.1
Applied, thanks.
Huacai
Quoted 143 lines · Youling Tang
From: Youling Tang <[email protected]>
Add support for the stackleak feature. It initialize the stack with the poison value before returning from system calls which improves the kernel security.
At the same time, disables the plugin in EFI stub code because EFI stub is out of scope for the protection.
Tested on 3A5000 (enable
CONFIG_GCC_PLUGIN_STACKLEAKandCONFIG_LKDTM):# echo STACKLEAK_ERASING > /sys/kernel/debug/provoke-crash/DIRECT # dmesg lkdtm: Performing direct entry STACKLEAK_ERASING lkdtm: stackleak stack usage: high offset: 320 bytes current: 448 bytes lowest: 1264 bytes tracked: 1264 bytes untracked: 208 bytes poisoned: 14528 bytes low offset: 64 bytes lkdtm: OK: the rest of the thread stack is properly erasedSigned-off-by Youling Tang <[email protected]>---
v2:
* Makeon_thread_stack()__always_inline.
* Move theSTACKLEAK_ERASEmacro to thestackframe.hfile.arch/loongarch/Kconfig | 1 + arch/loongarch/include/asm/entry-common.h | 8 +------- arch/loongarch/include/asm/stackframe.h | 6 ++++++ arch/loongarch/include/asm/stacktrace.h | 5 +++++ arch/loongarch/kernel/entry.S | 3 +++ drivers/firmware/efi/libstub/Makefile | 2 +- 6 files changed, 17 insertions(+), 8 deletions(-)arch/loongarch/Kconfig +1
-0@@ -122,6 +122,7 @@ config LOONGARCH select HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET select HAVE_ARCH_SECCOMP select HAVE_ARCH_SECCOMP_FILTER + select HAVE_ARCH_STACKLEAK select HAVE_ARCH_TRACEHOOK select HAVE_ARCH_TRANSPARENT_HUGEPAGE select HAVE_ARCH_USERFAULTFD_MINOR if USERFAULTFDarch/loongarch/include/asm/entry-common.h +1
-7@@ -2,12 +2,6 @@#ifndef ARCH_LOONGARCH_ENTRY_COMMON_H #define ARCH_LOONGARCH_ENTRY_COMMON_H -#include <linux/sched.h> -#include <linux/processor.h> - -static inline bool on_thread_stack (void ) -{ -return !(((unsigned long )(current->stack) ^ current_stack_pointer) & ~(THREAD_SIZE -1 )); -} +#include <asm/stacktrace.h> #endif arch/loongarch/include/asm/stackframe.h +6
-0@@ -243,4 +243,10 @@ RESTORE_SP_AND_RET \docfi .endm + .macro STACKLEAK_ERASE +#ifdef CONFIG_GCC_PLUGIN_STACKLEAK + bl stackleak_erase_on_task_stack +#endif + .endm +#endif /* _ASM_STACKFRAME_H */ arch/loongarch/include/asm/stacktrace.h +5
-0@@ -31,6 +31,11 @@ bool in_irq_stack(unsigned long stack, struct stack_info *info);bool in_task_stack (unsigned long stack,struct task_struct *task,struct stack_info *info);int get_stack_info (unsigned long stack,struct task_struct *task,struct stack_info *info); +static __always_inline bool on_thread_stack(void) +{ +return !(((unsigned long )(current->stack) ^ current_stack_pointer) & ~(THREAD_SIZE -1 )); +} +#define STR_LONG_L __stringify(LONG_L)#define STR_LONG_S __stringify(LONG_S)#define STR_LONGSIZE __stringify(LONGSIZE)arch/loongarch/kernel/entry.S +3
-0@@ -73,6 +73,7 @@ SYM_CODE_START(handle_syscall) move a0, sp bl do_syscall + STACKLEAK_ERASE RESTORE_ALL_AND_RET SYM_CODE_END(handle_syscall) _ASM_NOKPROBE(handle_syscall)@@ -82,6 +83,7 @@ SYM_CODE_START(ret_from_fork) bl schedule_tail # a0 = struct task_struct *prev move a0, sp bl syscall_exit_to_user_mode + STACKLEAK_ERASE RESTORE_STATIC RESTORE_SOME RESTORE_SP_AND_RET@@ -94,6 +96,7 @@ SYM_CODE_START(ret_from_kernel_thread) jirl ra, s0, 0 move a0, sp bl syscall_exit_to_user_mode + STACKLEAK_ERASE RESTORE_STATIC RESTORE_SOME RESTORE_SP_AND_RETdrivers/firmware/efi/libstub/Makefile +1
-2@@ -31,7 +31,7 @@ cflags-$(CONFIG_ARM) += -DEFI_HAVE_STRLEN -DEFI_HAVE_STRNLEN \ $(DISABLE_STACKLEAK_PLUGIN) cflags-$(CONFIG_RISCV) += -fpic -DNO_ALTERNATIVE -mno-relax \ $(DISABLE_STACKLEAK_PLUGIN) -cflags-$(CONFIG_LOONGARCH) += -fpie +cflags-$(CONFIG_LOONGARCH) += -fpie $(DISABLE_STACKLEAK_PLUGIN) cflags-$(CONFIG_EFI_PARAMS_FROM_FDT) += -I$(srctree)/scripts/dtc/libfdt --2.38.1