[lkml]   [2018]   [Mar]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[PATCH 3.16 36/76] kprobes/x86: Blacklist indirect thunk functions for kprobes
3.16.56-rc1 review patch.  If anyone has any objections, please let me know.


From: Masami Hiramatsu <>

commit c1804a236894ecc942da7dc6c5abe209e56cba93 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 <>
Signed-off-by: Thomas Gleixner <>
Acked-by: David Woodhouse <>
Cc: Andi Kleen <>
Cc: Peter Zijlstra <>
Cc: Ananth N Mavinakayanahalli <>
Cc: Arjan van de Ven <>
Cc: Greg Kroah-Hartman <>
[bwh: Backported to 3.16: exports are still done from C]
Signed-off-by: Ben Hutchings <>
--- a/arch/x86/lib/retpoline.S
+++ b/arch/x86/lib/retpoline.S
@@ -24,7 +24,9 @@ ENDPROC(__x86_indirect_thunk_\reg)
* than one per register with the correct names. So we do it
* the simple and nasty way...
-#define GENERATE_THUNK(reg) THUNK reg
+#define __EXPORT_THUNK(sym) _ASM_NOKPROBE(sym)
+#define EXPORT_THUNK(reg) __EXPORT_THUNK(__x86_indirect_thunk_ ## reg)
+#define GENERATE_THUNK(reg) THUNK reg ; EXPORT_THUNK(reg)

 \ /
  Last update: 2018-03-12 04:32    [W:0.284 / U:1.856 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site