From a3c7cd11d21b5dae55c9731995cb166c14c1a484 Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Tue, 22 May 2018 13:30:56 +0000 Subject: [PATCH] Fix double-load of %cr3 and double-copy of the stack frame for the kernel entry from userspace vm86. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/i386/include/asmacros.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/i386/include/asmacros.h b/sys/i386/include/asmacros.h index 15d70ef65bd0..1d60351f5c7a 100644 --- a/sys/i386/include/asmacros.h +++ b/sys/i386/include/asmacros.h @@ -218,7 +218,7 @@ testl $PCB_VM86CALL, PCB_FLAGS(%eax) jnz 3f NMOVE_STACKS - jmp 2f + jmp 3f 1: testb $SEL_RPL_MASK, TF_CS(%esp) jz 3f 2: MOVE_STACKS