Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e3ae6c5 authored by Gleb Natapov's avatar Gleb Natapov Committed by Avi Kivity
Browse files

KVM: x86 emulator: fix mov r/m, sreg emulation. 



mov r/m, sreg generates #UD ins sreg is incorrect.

Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 063db061

arch/x86/kvm/emulate.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -2126,12 +2126,11 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) 
	case 0x8c: { /* mov r/m, sreg */

	case 0x8c: { /* mov r/m, sreg */

		struct kvm_segment segreg;

		struct kvm_segment segreg;





		if (c->modrm_reg <= 5)

		if (c->modrm_reg <= VCPU_SREG_GS)

			kvm_get_segment(ctxt->vcpu, &segreg, c->modrm_reg);

			kvm_get_segment(ctxt->vcpu, &segreg, c->modrm_reg);

		else {

		else {

			printk(KERN_INFO "0x8c: Invalid segreg in modrm byte 0x%02x\n",

			kvm_queue_exception(ctxt->vcpu, UD_VECTOR);

			       c->modrm);

			goto done;

			goto cannot_emulate;

		}

		}

		c->dst.val = segreg.selector;

		c->dst.val = segreg.selector;

		break;

		break;