Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2718208 authored by Jan Beulich's avatar Jan Beulich Committed by Linus Torvalds
Browse files

[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: default avatar"Seth, Rohit" <rohit.seth@intel.com>
Cc: Zachary Amsden <zach@vmware.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 27d99f7e

arch/i386/kernel/entry.S

+3 −4
Original line number Diff line number Diff line
@@ -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