From: Paolo Bonzini <pbonzini@redhat.com>
To: Ricky Zhou <ricky@rzhou.org>, qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH] target-i386: Allow execute from user mode when SMEP is enabled.
Date: Tue, 15 Jul 2014 09:32:55 +0200 [thread overview]
Message-ID: <53C4D927.7090908@redhat.com> (raw)
In-Reply-To: <1405371287-12189-1-git-send-email-ricky@rzhou.org>
Il 14/07/2014 22:54, Ricky Zhou ha scritto:
> 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>
> ---
> 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) {
>
Thanks, queued for 2.1.
Paolo
prev parent reply other threads:[~2014-07-15 7:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-14 20:54 [Qemu-devel] [PATCH] target-i386: Allow execute from user mode when SMEP is enabled Ricky Zhou
2014-07-15 7:32 ` Paolo Bonzini [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53C4D927.7090908@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=ricky@rzhou.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).