Skip to content

Commit

Permalink
x86/traps: Ignore high word of regs->cs in early_idt_handler_common
Browse files Browse the repository at this point in the history
This is a backport of:
commit fc0e81b upstream

On the 80486 DX, it seems that some exceptions may leave garbage in
the high bits of CS.  This causes sporadic failures in which
early_fixup_exception() refuses to fix up an exception.

As far as I can tell, this has been buggy for a long time, but the
problem seems to have been exacerbated by commits:

  1e02ce4 ("x86: Store a per-cpu shadow copy of CR4")
  e1bfc11 ("x86/init: Fix cr4_init_shadow() on CR4-less machines")

This appears to have broken for as long as we've had early
exception handling.

[ This backport should apply to kernels from 3.4 - 4.5. ]

Fixes: 4c5023a ("x86-32: Handle exception table entries during early boot")
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: stable@vger.kernel.org
Reported-by: Matthew Whitehead <tedheadster@gmail.com>
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Signed-off-by: Willy Tarreau <w@1wt.eu>
  • Loading branch information
Andy Lutomirski authored and Willy Tarreau committed Feb 6, 2017
1 parent 506750b commit 213060d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/x86/kernel/head_32.S
Original file line number Diff line number Diff line change
@@ -586,7 +586,7 @@ early_idt_handler_common:
movl %eax,%ds
movl %eax,%es

cmpl $(__KERNEL_CS),32(%esp)
cmpw $(__KERNEL_CS),32(%esp)
jne 10f

leal 28(%esp),%eax # Pointer to %eip

0 comments on commit 213060d

Please sign in to comment.