Commit 107d6d2e authored by Avi Kivity's avatar Avi Kivity

KVM: x86 emulator: fix writes to registers with modrm encodings

A register destination encoded with a mod=3 encoding left dst.ptr NULL.
Normally we don't trap writes to registers, but in the case of smsw, we do.

Fix by pointing dst.ptr at the destination register.
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent f26a3988
...@@ -677,8 +677,9 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt, ...@@ -677,8 +677,9 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt,
c->use_modrm_ea = 1; c->use_modrm_ea = 1;
if (c->modrm_mod == 3) { if (c->modrm_mod == 3) {
c->modrm_val = *(unsigned long *) c->modrm_ptr = decode_register(c->modrm_rm,
decode_register(c->modrm_rm, c->regs, c->d & ByteOp); c->regs, c->d & ByteOp);
c->modrm_val = *(unsigned long *)c->modrm_ptr;
return rc; return rc;
} }
...@@ -1005,6 +1006,7 @@ done_prefixes: ...@@ -1005,6 +1006,7 @@ done_prefixes:
if ((c->d & ModRM) && c->modrm_mod == 3) { if ((c->d & ModRM) && c->modrm_mod == 3) {
c->src.type = OP_REG; c->src.type = OP_REG;
c->src.val = c->modrm_val; c->src.val = c->modrm_val;
c->src.ptr = c->modrm_ptr;
break; break;
} }
c->src.type = OP_MEM; c->src.type = OP_MEM;
...@@ -1049,6 +1051,7 @@ done_prefixes: ...@@ -1049,6 +1051,7 @@ done_prefixes:
if ((c->d & ModRM) && c->modrm_mod == 3) { if ((c->d & ModRM) && c->modrm_mod == 3) {
c->dst.type = OP_REG; c->dst.type = OP_REG;
c->dst.val = c->dst.orig_val = c->modrm_val; c->dst.val = c->dst.orig_val = c->modrm_val;
c->dst.ptr = c->modrm_ptr;
break; break;
} }
c->dst.type = OP_MEM; c->dst.type = OP_MEM;
......
...@@ -135,6 +135,7 @@ struct decode_cache { ...@@ -135,6 +135,7 @@ struct decode_cache {
u8 modrm_rm; u8 modrm_rm;
u8 use_modrm_ea; u8 use_modrm_ea;
unsigned long modrm_ea; unsigned long modrm_ea;
void *modrm_ptr;
unsigned long modrm_val; unsigned long modrm_val;
struct fetch_cache fetch; struct fetch_cache fetch;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment