[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/6] target-i386: Allow execute from user mode when S
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 1/6] target-i386: Allow execute from user mode when SMEP is enabled. |
Date: |
Fri, 18 Jul 2014 11:04:20 +0200 |
From: Ricky Zhou <address@hidden>
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 <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
target-i386/helper.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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 @@ do_check_protect_pse36:
/* 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) {
--
1.9.3
- [Qemu-devel] [PULL for-2.1 0/6] target-i386, module, qtest patches for 2014-07-18, Paolo Bonzini, 2014/07/18
- [Qemu-devel] [PULL 6/6] Revert "kvmclock: Ensure time in migration never goes backward", Paolo Bonzini, 2014/07/18
- [Qemu-devel] [PULL 2/6] qtest: new test for wdt_ib700, Paolo Bonzini, 2014/07/18
- Re: [Qemu-devel] [PULL for-2.1 0/6] target-i386, module, qtest patches for 2014-07-18, Peter Maydell, 2014/07/18