[PATCH] i386: NMI pointer comparison fix
Instruction pointer comparisons for the NMI on debug stack check/fixup were incorrect. From: Jan Beulich <jbeulich@novell.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Zwane Mwaikambo <zwane@holomorphy.com> Acked-by: "Seth, Rohit" <rohit.seth@intel.com> Cc: Zachary Amsden <zach@vmware.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
27d99f7ead
commit
e27182088e
|
@ -560,11 +560,10 @@ nmi_stack_fixup:
|
||||||
nmi_debug_stack_check:
|
nmi_debug_stack_check:
|
||||||
cmpw $__KERNEL_CS,16(%esp)
|
cmpw $__KERNEL_CS,16(%esp)
|
||||||
jne nmi_stack_correct
|
jne nmi_stack_correct
|
||||||
cmpl $debug - 1,(%esp)
|
cmpl $debug,(%esp)
|
||||||
jle nmi_stack_correct
|
jb nmi_stack_correct
|
||||||
cmpl $debug_esp_fix_insn,(%esp)
|
cmpl $debug_esp_fix_insn,(%esp)
|
||||||
jle nmi_debug_stack_fixup
|
ja nmi_stack_correct
|
||||||
nmi_debug_stack_fixup:
|
|
||||||
FIX_STACK(24,nmi_stack_correct, 1)
|
FIX_STACK(24,nmi_stack_correct, 1)
|
||||||
jmp nmi_stack_correct
|
jmp nmi_stack_correct
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue