[PATCH] i386: NMI pointer comparison fix

Instruction pointer comparisons for the NMI on debug stack check/fixup were incorrect. From: Jan Beulich <[email protected]> Cc: "Eric W. Biederman" <[email protected]> Cc: Zwane Mwaikambo <[email protected]> Acked-by: "Seth, Rohit" <[email protected]> Cc: Zachary Amsden <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
sum-it · Nov 14, 2005 · e271820 · e271820
1 parent 27d99f7
commit e271820
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/arch/i386/kernel/entry.S b/arch/i386/kernel/entry.S
@@ -560,11 +560,10 @@ nmi_stack_fixup:
 nmi_debug_stack_check:
 	cmpw $__KERNEL_CS,16(%esp)
 	jne nmi_stack_correct
-	cmpl $debug - 1,(%esp)
-	jle nmi_stack_correct
+	cmpl $debug,(%esp)
+	jb nmi_stack_correct
 	cmpl $debug_esp_fix_insn,(%esp)
-	jle nmi_debug_stack_fixup
-nmi_debug_stack_fixup:
+	ja nmi_stack_correct
 	FIX_STACK(24,nmi_stack_correct, 1)
 	jmp nmi_stack_correct