Fix iopl flag when sysenter/exit are used

Change-Id: If8c12f987c3adb8f329ae163da6b2f1cb8cc772f

diff --git a/minix/kernel/arch/i386/mpx.S b/minix/kernel/arch/i386/mpx.S
index 4617bfdc2bdaeea0ea6772f41bee7d8a44970262..81fb696a3c73a384a542d689abe7f6888d7bfe7d 100644 (file)
--- a/minix/kernel/arch/i386/mpx.S
+++ b/minix/kernel/arch/i386/mpx.S
@@ -402,7 +402,12 @@ ENTRY(restore_user_context_sysenter)
        mov     SPREG(%ebp), %ecx       /* sysexit restores ESP using ECX */
        mov     AXREG(%ebp), %eax       /* trap return value */
        mov     BXREG(%ebp), %ebx       /* secondary return value */
-       movl    PSWREG(%ebp), %edi      /* load desired PSW to EDI */
+
+        /* restore PSW */
+        movl    PSWREG(%ebp), %edi      /* load desired PSW to EDI */
+        push    %edi
+        popf
+
        sti                             /* enable interrupts */
        sysexit                         /* jump to EIP in user */