3.10-stable patches

added patches:
	x86-asm-traps-disable-tracing-and-kprobes-in-fixup_bad_iret-and-sync_regs.patch

diff --git a/queue-3.10/series b/queue-3.10/series
index ff53f1d760587e3f3d6fd110847ef749af47135c..530cc2bd1bc07bb80856be2dabf0b6e49481ca7f 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -18,3 +18,4 @@ x86-tsc-change-fast-tsc-calibration-failed-from-error-to-info.patch
 kvm-x86-fix-of-previously-incomplete-fix-for-cve-2014-8480.patch
 x86-tls-ldt-stop-checking-lm-in-ldt_empty.patch
 x86-tls-interpret-an-all-zero-struct-user_desc-as-no-segment.patch
+x86-asm-traps-disable-tracing-and-kprobes-in-fixup_bad_iret-and-sync_regs.patch

diff --git a/queue-3.10/x86-asm-traps-disable-tracing-and-kprobes-in-fixup_bad_iret-and-sync_regs.patch b/queue-3.10/x86-asm-traps-disable-tracing-and-kprobes-in-fixup_bad_iret-and-sync_regs.patch
new file mode 100644 (file)
index 0000000..fc14d59
--- /dev/null
+++ b/queue-3.10/x86-asm-traps-disable-tracing-and-kprobes-in-fixup_bad_iret-and-sync_regs.patch
@@ -0,0 +1,48 @@
+From 7ddc6a2199f1da405a2fb68c40db8899b1a8cd87 Mon Sep 17 00:00:00 2001
+From: Andy Lutomirski <luto@amacapital.net>
+Date: Mon, 24 Nov 2014 17:39:06 -0800
+Subject: x86/asm/traps: Disable tracing and kprobes in fixup_bad_iret and sync_regs
+
+From: Andy Lutomirski <luto@amacapital.net>
+
+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>
+
+---
+ arch/x86/kernel/traps.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- 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)
+ {
+       /*