commit 7d0d6bcb0ac9e49e4617f8e0ceb6f549f4992706
author Paolo Bonzini <pbonzini@redhat.com> Fri Sep 15 23:22:32 2017 +0200
committer Paolo Bonzini <pbonzini@redhat.com> Wed Sep 20 09:24:16 2017 +0200
tree 26b0749c11708d33786d8735f05ef2688957929f
parent e8a1ce743af819c1b669793e1b2e149b0159f7b1

x86: fix access.flat on non-SMEP machines

We need to restore PDPE.U=1, similar to what the tests do after printing
the "Set SMEP in CR4 - expect #GP: FAIL" message.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <1505510552-22114-1-git-send-email-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

x86/access.c

diff --git a/x86/access.c b/x86/access.c
index a0c19dc..11f561b 100644
--- a/x86/access.c
+++ b/x86/access.c
@@ -207,7 +207,7 @@
     if (smep)
         ptl2[2] &= ~PT_USER_MASK;
     r = write_cr4_checking(cr4);
-    if (!smep)
+    if (r || !smep)
         ptl2[2] |= PT_USER_MASK;
     return r;
 }