[kernel] r22117 - dists/wheezy-security/linux/debian/patches/features/all/rt

[Ben Hutchings]

Author: benh
Date: Sun Dec  7 03:42:04 2014
New Revision: 22117

Log:
Resolve conflicts between rt patcheset and fix for CVE-2014-9090

Deleted:
   dists/wheezy-security/linux/debian/patches/features/all/rt/0222-x86-Disable-IST-stacks-for-debug-int-3-stack-fault-f.patch
   dists/wheezy-security/linux/debian/patches/features/all/rt/0333-Revert-x86-Disable-IST-stacks-for-debug-int-3-stack-.patch
Modified:
   dists/wheezy-security/linux/debian/patches/features/all/rt/0066-x86-Do-not-disable-preemption-in-int3-on-32bit.patch

Modified: dists/wheezy-security/linux/debian/patches/features/all/rt/0066-x86-Do-not-disable-preemption-in-int3-on-32bit.patch
==============================================================================
--- dists/wheezy-security/linux/debian/patches/features/all/rt/0066-x86-Do-not-disable-preemption-in-int3-on-32bit.patch	Sun Dec  7 03:00:32 2014	(r22116)
+++ dists/wheezy-security/linux/debian/patches/features/all/rt/0066-x86-Do-not-disable-preemption-in-int3-on-32bit.patch	Sun Dec  7 03:42:04 2014	(r22117)
@@ -19,15 +19,11 @@
 Cc: stable-rt at vger.kernel.org
 Signed-off-by: Steven Rostedt <rostedt at goodmis.org>
 Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
+[bwh: Dropped changes to do_stack_segment(), removed by fix for CVE-2014-9090]
 ---
- arch/x86/kernel/traps.c | 32 +++++++++++++++++++++++---------
- 1 file changed, 23 insertions(+), 9 deletions(-)
-
-diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
-index 20061b9..8e58b45 100644
 --- a/arch/x86/kernel/traps.c
 +++ b/arch/x86/kernel/traps.c
-@@ -87,9 +87,21 @@ static inline void conditional_sti(struct pt_regs *regs)
+@@ -87,9 +87,21 @@ static inline void conditional_sti(struc
  		local_irq_enable();
  }
  
@@ -50,7 +46,7 @@
  	if (regs->flags & X86_EFLAGS_IF)
  		local_irq_enable();
  }
-@@ -100,11 +112,13 @@ static inline void conditional_cli(struct pt_regs *regs)
+@@ -100,11 +112,13 @@ static inline void conditional_cli(struc
  		local_irq_disable();
  }
  
@@ -65,19 +61,7 @@
  }
  
  static void __kprobes
-@@ -226,9 +240,9 @@ dotraplinkage void do_stack_segment(struct pt_regs *regs, long error_code)
- 	if (notify_die(DIE_TRAP, "stack segment", regs, error_code,
- 			X86_TRAP_SS, SIGBUS) == NOTIFY_STOP)
- 		return;
--	preempt_conditional_sti(regs);
-+	conditional_sti_ist(regs);
- 	do_trap(X86_TRAP_SS, SIGBUS, "stack segment", regs, error_code, NULL);
--	preempt_conditional_cli(regs);
-+	conditional_cli_ist(regs);
- }
- 
- dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
-@@ -321,9 +335,9 @@ dotraplinkage void __kprobes do_int3(struct pt_regs *regs, long error_code)
+@@ -333,9 +347,9 @@ dotraplinkage void __kprobes do_int3(str
  		return;
  #endif
  
@@ -89,7 +73,7 @@
  }
  
  #ifdef CONFIG_X86_64
-@@ -417,12 +431,12 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
+@@ -458,12 +472,12 @@ dotraplinkage void __kprobes do_debug(st
  		return;
  
  	/* It's safe to allow irq's after DR6 has been saved */
@@ -104,7 +88,7 @@
  		return;
  	}
  
-@@ -441,7 +455,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
+@@ -482,7 +496,7 @@ dotraplinkage void __kprobes do_debug(st
  	si_code = get_si_code(tsk->thread.debugreg6);
  	if (tsk->thread.debugreg6 & (DR_STEP | DR_TRAP_BITS) || user_icebp)
  		send_sigtrap(tsk, regs, error_code, si_code);