Skip to content

Commit aaadccc

Browse files
mhiramatgregkh
authored andcommitted
kprobes/x86: Blacklist indirect thunk functions for kprobes
commit c1804a2 upstream. 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> Link: https://lkml.kernel.org/r/151629209111.10241.5444852823378068683.stgit@devbox Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 22371c4 commit aaadccc

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

arch/x86/lib/retpoline.S

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ ENDPROC(__x86_indirect_thunk_\reg)
2525
* than one per register with the correct names. So we do it
2626
* the simple and nasty way...
2727
*/
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)
2930
#define GENERATE_THUNK(reg) THUNK reg ; EXPORT_THUNK(reg)
3031

3132
GENERATE_THUNK(_ASM_AX)

0 commit comments

Comments
 (0)