Commit 510425ff authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: x86 emulator: fix LIDT/LGDT in long mode 



The operand size for these instructions is 8 bytes in long mode, even without
a REX prefix.  Set it explicitly.

Triggered while booting Linux with emulate_invalid_guest_state=1.

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 79d5b4c3

arch/x86/kvm/emulate.c

+4 −0
Original line number Diff line number Diff line
@@ -2997,6 +2997,8 @@ static int em_lgdt(struct x86_emulate_ctxt *ctxt) 
	struct desc_ptr desc_ptr;

	int rc;



	if (ctxt->mode == X86EMUL_MODE_PROT64)

		ctxt->op_bytes = 8;

	rc = read_descriptor(ctxt, ctxt->src.addr.mem,

			     &desc_ptr.size, &desc_ptr.address,

			     ctxt->op_bytes);
@@ -3024,6 +3026,8 @@ static int em_lidt(struct x86_emulate_ctxt *ctxt) 
	struct desc_ptr desc_ptr;

	int rc;



	if (ctxt->mode == X86EMUL_MODE_PROT64)

		ctxt->op_bytes = 8;

	rc = read_descriptor(ctxt, ctxt->src.addr.mem,

			     &desc_ptr.size, &desc_ptr.address,

			     ctxt->op_bytes);