summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGleb Natapov <gleb@redhat.com>2013-04-24 13:38:36 +0300
committerGleb Natapov <gleb@redhat.com>2013-04-25 10:03:50 +0300
commit660696d1d16a71e15549ce1bf74953be1592bcd3 (patch)
tree376a0701d4e8b4d148d87a5a5e8bcb7668fc360f
parentd1fa0352a151a597e8749e7be84121a1ff0d3502 (diff)
downloadlinux-3.10-660696d1d16a71e15549ce1bf74953be1592bcd3.tar.gz
linux-3.10-660696d1d16a71e15549ce1bf74953be1592bcd3.tar.bz2
linux-3.10-660696d1d16a71e15549ce1bf74953be1592bcd3.zip
KVM: X86 emulator: fix source operand decoding for 8bit mov[zs]x instructions
Source operand for one byte mov[zs]x is decoded incorrectly if it is in high byte register. Fix that. Cc: stable@vger.kernel.org Signed-off-by: Gleb Natapov <gleb@redhat.com>
-rw-r--r--arch/x86/kvm/emulate.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 46f63b8d09f..8e517bba6a7 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -4172,6 +4172,10 @@ static int decode_operand(struct x86_emulate_ctxt *ctxt, struct operand *op,
break;
case OpMem8:
ctxt->memop.bytes = 1;
+ if (ctxt->memop.type == OP_REG) {
+ ctxt->memop.addr.reg = decode_register(ctxt, ctxt->modrm_rm, 1);
+ fetch_register_operand(&ctxt->memop);
+ }
goto mem_common;
case OpMem16:
ctxt->memop.bytes = 2;