From: Marcelo Tosatti <mtosatti@redhat.com>
To: kvm <kvm@vger.kernel.org>
Cc: Avi Kivity <avi@redhat.com>, Joerg Roedel <joerg.roedel@amd.com>
Subject: KVM: x86: use proper port value when checking io instruction permission
Date: Tue, 24 May 2011 14:11:20 -0300 [thread overview]
Message-ID: <20110524171120.GA19906@amt.cnet> (raw)
Commit fa4491a6b667304 moved the permission check for io instructions
to the ->check_perm callback. It failed to copy the port value from RDX
register for string and "in,out ax,dx" instructions. Fix it.
Fixes FC8.32 installation.
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 3bc6b7a..df354a4 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -2944,6 +2944,15 @@ static int check_perm_in(struct x86_emulate_ctxt *ctxt)
{
struct decode_cache *c = &ctxt->decode;
+ switch (c->b) {
+ case 0x6c: /* insb */
+ case 0x6d: /* insw/insd */
+ case 0xec: /* in al,dx */
+ case 0xed: /* in (e/r)ax,dx */
+ c->src.val = c->regs[VCPU_REGS_RDX];
+ break;
+ }
+
c->dst.bytes = min(c->dst.bytes, 4u);
if (!emulator_io_permited(ctxt, c->src.val, c->dst.bytes))
return emulate_gp(ctxt, 0);
@@ -2955,6 +2964,15 @@ static int check_perm_out(struct x86_emulate_ctxt *ctxt)
{
struct decode_cache *c = &ctxt->decode;
+ switch (c->b) {
+ case 0x6e: /* outsb */
+ case 0x6f: /* outsw/outsd */
+ case 0xee: /* out dx,al */
+ case 0xef: /* out dx,(e/r)ax */
+ c->dst.val = c->regs[VCPU_REGS_RDX];
+ break;
+ }
+
c->src.bytes = min(c->src.bytes, 4u);
if (!emulator_io_permited(ctxt, c->dst.val, c->src.bytes))
return emulate_gp(ctxt, 0);
next reply other threads:[~2011-05-24 17:11 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-24 17:11 Marcelo Tosatti [this message]
2011-05-24 17:27 ` KVM: x86: use proper port value when checking io instruction permission Gleb Natapov
2011-05-24 19:07 ` Avi Kivity
2011-05-24 19:18 ` Gleb Natapov
2011-05-24 19:25 ` Avi Kivity
2011-05-25 18:18 ` KVM: x86: use proper port value when checking io instruction permission (v2) Marcelo Tosatti
2011-05-26 6:31 ` Avi Kivity
2011-05-26 6:55 ` Gleb Natapov
2011-05-26 7:02 ` Avi Kivity
2011-05-26 7:04 ` Avi Kivity
2011-05-26 7:07 ` Gleb Natapov
2011-05-26 7:49 ` Paolo Bonzini
2011-05-26 8:26 ` Gleb Natapov
2011-05-26 9:00 ` Paolo Bonzini
2011-05-26 9:02 ` Gleb Natapov
2011-05-26 9:23 ` Paolo Bonzini
2011-05-26 9:29 ` Gleb Natapov
2011-05-26 10:43 ` Marcelo Tosatti
2011-05-26 11:56 ` KVM: x86: use proper port value when checking io instruction permission (v3) Marcelo Tosatti
2011-05-29 8:34 ` Avi Kivity
2011-05-30 18:23 ` KVM: x86: use proper port value when checking io instruction permission (v4) Marcelo Tosatti
2011-05-30 18:28 ` Avi Kivity
2011-05-30 18:23 ` KVM: x86: use proper port value when checking io instruction permission (v3) Marcelo Tosatti
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=20110524171120.GA19906@amt.cnet \
--to=mtosatti@redhat.com \
--cc=avi@redhat.com \
--cc=joerg.roedel@amd.com \
--cc=kvm@vger.kernel.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