diff options
| author | Kees Cook <keescook@chromium.org> | 2020-08-21 22:43:03 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-09-01 11:03:18 +0300 |
| commit | a850958c072404f75dd41782cb4ff34b8625b47d (patch) | |
| tree | 674a8fa2b3d7f0ce869729f30ad8c5dde35797f0 /arch/x86/include/asm/asm.h | |
| parent | 7e8c4ed2638d08a1604c87b60ed7161bf92e6f86 (diff) | |
| download | linux-a850958c072404f75dd41782cb4ff34b8625b47d.tar.xz | |
x86/asm: Avoid generating unused kprobe sections
When !CONFIG_KPROBES, do not generate kprobe sections. This makes
sure there are no unexpected sections encountered by the linker scripts.
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20200821194310.3089815-23-keescook@chromium.org
Diffstat (limited to 'arch/x86/include/asm/asm.h')
| -rw-r--r-- | arch/x86/include/asm/asm.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/include/asm/asm.h b/arch/x86/include/asm/asm.h index 5c15f95b1ba7..4712206c4325 100644 --- a/arch/x86/include/asm/asm.h +++ b/arch/x86/include/asm/asm.h @@ -138,11 +138,15 @@ # define _ASM_EXTABLE_FAULT(from, to) \ _ASM_EXTABLE_HANDLE(from, to, ex_handler_fault) -# define _ASM_NOKPROBE(entry) \ +# ifdef CONFIG_KPROBES +# define _ASM_NOKPROBE(entry) \ .pushsection "_kprobe_blacklist","aw" ; \ _ASM_ALIGN ; \ _ASM_PTR (entry); \ .popsection +# else +# define _ASM_NOKPROBE(entry) +# endif #else /* ! __ASSEMBLY__ */ # define _EXPAND_EXTABLE_HANDLE(x) #x |