Commit 2b3d2a20 authored Dec 23, 2008 by Avi Kivity

KVM: Fix vmload and friends misinterpreted as lidt



The AMD SVM instruction family all overload the 0f 01 /3 opcode, further
multiplexing on the three r/m bits.  But the code decided that anything that
isn't a vmmcall must be an lidt (which shares the 0f 01 /3 opcode, for the
case that mod = 3).

Fix by aborting emulation if this isn't a vmmcall.

Signed-off-by: Avi Kivity <avi@redhat.com>

parent e2078318

arch/x86/kvm/x86_emulate.c

+10 −5

Original line number	Diff line number	Diff line
		@@ -1908,11 +1908,16 @@ twobyte_insn:
		c->dst.type = OP_NONE;
		break;
		case 3: /* lidt/vmmcall */
		if (c->modrm_mod == 3 && c->modrm_rm == 1) {
		if (c->modrm_mod == 3) {
		switch (c->modrm_rm) {
		case 1:
		rc = kvm_fix_hypercall(ctxt->vcpu);
		if (rc)
		goto done;
		kvm_emulate_hypercall(ctxt->vcpu);
		break;
		default:
		goto cannot_emulate;
		}
		} else {
		rc = read_descriptor(ctxt, ops, c->src.ptr,
		&size, &address,

Admin message