path: root/arch
diff options
authorAndy Lutomirski <luto@amacapital.net>2014-11-24 17:39:06 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-01-29 17:40:56 -0800
commit26dc5324ff8c0d8d519428f79f567e07eb3f9508 (patch)
treefd3fa92feac3ecb699b823136d8f4a56b68775fc /arch
parentd509b1d8c389bce08dd966aec8993d1bfe871261 (diff)
x86/asm/traps: Disable tracing and kprobes in fixup_bad_iret and sync_regs
commit 7ddc6a2199f1da405a2fb68c40db8899b1a8cd87 upstream. These functions can be executed on the int3 stack, so kprobes are dangerous. Tracing is probably a bad idea, too. Fixes: b645af2d5905 ("x86_64, traps: Rework bad_iret") Signed-off-by: Andy Lutomirski <luto@amacapital.net> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Steven Rostedt <rostedt@goodmis.org> Link: http://lkml.kernel.org/r/50e33d26adca60816f3ba968875801652507d0c4.1416870125.git.luto@amacapital.net Signed-off-by: Ingo Molnar <mingo@kernel.org> [bwh: Backported to 3.10: - Use __kprobes instead of NOKPROBE_SYMBOL() - Adjust context] Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 332cafe909eb..0010ed7c3ec2 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -362,7 +362,7 @@ exit:
* for scheduling or signal handling. The actual stack switch is done in
* entry.S
-asmlinkage __kprobes struct pt_regs *sync_regs(struct pt_regs *eregs)
+asmlinkage notrace __kprobes struct pt_regs *sync_regs(struct pt_regs *eregs)
struct pt_regs *regs = eregs;
/* Did already sync */
@@ -387,7 +387,7 @@ struct bad_iret_stack {
struct pt_regs regs;
-asmlinkage __visible
+asmlinkage __visible notrace __kprobes
struct bad_iret_stack *fixup_bad_iret(struct bad_iret_stack *s)