diff options
| author | Jan Beulich <JBeulich@novell.com> | 2005-11-13 19:06:52 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-13 21:14:13 -0500 |
| commit | e27182088e607880713d9c286a3d92d861c280e4 (patch) | |
| tree | 2d2f43b45e377c3bfe093c2c0ca037d930f20176 /arch/i386/kernel/entry.S | |
| parent | 27d99f7ead8cd6d2231798bff0d4c38814afea22 (diff) | |
[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>
Diffstat (limited to 'arch/i386/kernel/entry.S')
| -rw-r--r-- | arch/i386/kernel/entry.S | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/i386/kernel/entry.S b/arch/i386/kernel/entry.S index 9e24f7b207ee..e50b93155249 100644 --- a/arch/i386/kernel/entry.S +++ b/arch/i386/kernel/entry.S | |||
| @@ -560,11 +560,10 @@ nmi_stack_fixup: | |||
| 560 | nmi_debug_stack_check: | 560 | nmi_debug_stack_check: |
| 561 | cmpw $__KERNEL_CS,16(%esp) | 561 | cmpw $__KERNEL_CS,16(%esp) |
| 562 | jne nmi_stack_correct | 562 | jne nmi_stack_correct |
| 563 | cmpl $debug - 1,(%esp) | 563 | cmpl $debug,(%esp) |
| 564 | jle nmi_stack_correct | 564 | jb nmi_stack_correct |
| 565 | cmpl $debug_esp_fix_insn,(%esp) | 565 | cmpl $debug_esp_fix_insn,(%esp) |
| 566 | jle nmi_debug_stack_fixup | 566 | ja nmi_stack_correct |
| 567 | nmi_debug_stack_fixup: | ||
| 568 | FIX_STACK(24,nmi_stack_correct, 1) | 567 | FIX_STACK(24,nmi_stack_correct, 1) |
| 569 | jmp nmi_stack_correct | 568 | jmp nmi_stack_correct |
| 570 | 569 | ||