* [PATCH] i386 NMI on debug stack check correction
@ 2005-05-12 8:12 Jan Beulich
0 siblings, 0 replies; only message in thread
From: Jan Beulich @ 2005-05-12 8:12 UTC (permalink / raw)
To: linux-kernel
[-- Attachment #1: Type: text/plain, Size: 799 bytes --]
(Note: Patch also attached because the inline version is certain to get
line wrapped.)
Stack pointer comparisons for the NMI on debug stack check/fixup were
incorrect.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
--- linux-2.6.12-rc4.base/arch/i386/kernel/entry.S 2005-05-11 17:27:52.217255616 +0200
+++ linux-2.6.12-rc4/arch/i386/kernel/entry.S 2005-05-11 17:50:36.239892656 +0200
@@ -557,11 +557,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
[-- Attachment #2: linux-2.6.12-rc4-i386-nmi.patch --]
[-- Type: text/plain, Size: 770 bytes --]
(Note: Patch also attached because the inline version is certain to get
line wrapped.)
Stack pointer comparisons for the NMI on debug stack check/fixup were
incorrect.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
--- linux-2.6.12-rc4.base/arch/i386/kernel/entry.S 2005-05-11 17:27:52.217255616 +0200
+++ linux-2.6.12-rc4/arch/i386/kernel/entry.S 2005-05-11 17:50:36.239892656 +0200
@@ -557,11 +557,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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2005-05-12 8:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-05-12 8:12 [PATCH] i386 NMI on debug stack check correction Jan Beulich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox