diff options
| author | Masami Hiramatsu <mhiramat@kernel.org> | 2018-01-18 11:14:51 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-01-19 10:31:28 -0500 |
| commit | c1804a236894ecc942da7dc6c5abe209e56cba93 (patch) | |
| tree | 1f289f478870b7fa6adcf545db624a2017b29c5a | |
| parent | 736e80a4213e9bbce40a7c050337047128b472ac (diff) | |
kprobes/x86: Blacklist indirect thunk functions for kprobes
Mark __x86_indirect_thunk_* functions as blacklist for kprobes
because those functions can be called from anywhere in the kernel
including blacklist functions of kprobes.
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: David Woodhouse <dwmw@amazon.co.uk>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Greg Kroah-Hartman <gregkh@linux-foundation.org>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/151629209111.10241.5444852823378068683.stgit@devbox
| -rw-r--r-- | arch/x86/lib/retpoline.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/lib/retpoline.S b/arch/x86/lib/retpoline.S index d3415dc30f82..dfb2ba91b670 100644 --- a/arch/x86/lib/retpoline.S +++ b/arch/x86/lib/retpoline.S | |||
| @@ -25,7 +25,8 @@ ENDPROC(__x86_indirect_thunk_\reg) | |||
| 25 | * than one per register with the correct names. So we do it | 25 | * than one per register with the correct names. So we do it |
| 26 | * the simple and nasty way... | 26 | * the simple and nasty way... |
| 27 | */ | 27 | */ |
| 28 | #define EXPORT_THUNK(reg) EXPORT_SYMBOL(__x86_indirect_thunk_ ## reg) | 28 | #define __EXPORT_THUNK(sym) _ASM_NOKPROBE(sym); EXPORT_SYMBOL(sym) |
| 29 | #define EXPORT_THUNK(reg) __EXPORT_THUNK(__x86_indirect_thunk_ ## reg) | ||
| 29 | #define GENERATE_THUNK(reg) THUNK reg ; EXPORT_THUNK(reg) | 30 | #define GENERATE_THUNK(reg) THUNK reg ; EXPORT_THUNK(reg) |
| 30 | 31 | ||
| 31 | GENERATE_THUNK(_ASM_AX) | 32 | GENERATE_THUNK(_ASM_AX) |