lkml.org 
[lkml]   [2005]   [Sep]   [6]   [last100]   RSS Feed
Views: [more markup]  [less markup]  [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
DateTue, 06 Sep 2005 11:46:09 +0200
From"Jan Beulich" <>
Subject[PATCH] resubmit: i386 NMI handler stack check adjustments
(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>

---
/home/jbeulich/tmp/linux-2.6.13/arch/i386/kernel/entry.S	2005-08-29
01:41:01.000000000 +0200
+++ 2.6.13/arch/i386/kernel/entry.S	2005-08-29 09:50:38.000000000
+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
 
[unhandled content-type:application/octet-stream]
\
 
 \ /
  Last update: 2005-09-06 09:47    [from the cache]
©2003-2008