commit b4bda1ae57a20a7ce7cb0077946fc33d6d6fd6c5
author Ricky Zhou <ricky@rzhou.org> Mon Jul 14 13:54:47 2014 -0700
committer Paolo Bonzini <pbonzini@redhat.com> Tue Jul 15 18:43:14 2014 +0200
tree e9806cae9b6ea9d379f5297e41e0d7451965908a
parent 146ae00192ffcbd78f6b11fa78c72d1b3d628d8a

target-i386: Allow execute from user mode when SMEP is enabled.

Previously, execute would be disabled for all pages with SMEP enabled,
regardless of what mode the access took place in.

Signed-off-by: Ricky Zhou <ricky@rzhou.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

target-i386/helper.c

diff --git a/target-i386/helper.c b/target-i386/helper.c
index 11ca864..47b982b 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -750,7 +750,8 @@
     /* the page can be put in the TLB */
     prot = PAGE_READ;
     if (!(ptep & PG_NX_MASK) &&
-        !((env->cr[4] & CR4_SMEP_MASK) && (ptep & PG_USER_MASK))) {
+        (mmu_idx == MMU_USER_IDX ||
+         !((env->cr[4] & CR4_SMEP_MASK) && (ptep & PG_USER_MASK)))) {
         prot |= PAGE_EXEC;
     }
     if (pte & PG_DIRTY_MASK) {