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

Commit 2e3810da authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull kvm fixes from Paolo Bonzini:
 "Three small fixes.

  Two for x86 and one avoids that sparse bails out"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: x86: SYSENTER emulation is broken
  KVM: x86: Fix of previously incomplete fix for CVE-2014-8480
  KVM: fix sparse warning in include/trace/events/kvm.h
parents 0ad4989d f3747379

arch/x86/kvm/emulate.c

+10 −21
Original line number Diff line number Diff line
@@ -2348,7 +2348,7 @@ static int em_sysenter(struct x86_emulate_ctxt *ctxt) 
	 * Not recognized on AMD in compat mode (but is recognized in legacy

	 * mode).

	 */

	if ((ctxt->mode == X86EMUL_MODE_PROT32) && (efer & EFER_LMA)

	if ((ctxt->mode != X86EMUL_MODE_PROT64) && (efer & EFER_LMA)

	    && !vendor_intel(ctxt))

		return emulate_ud(ctxt);
@@ -2359,25 +2359,13 @@ static int em_sysenter(struct x86_emulate_ctxt *ctxt) 
	setup_syscalls_segments(ctxt, &cs, &ss);



	ops->get_msr(ctxt, MSR_IA32_SYSENTER_CS, &msr_data);

	switch (ctxt->mode) {

	case X86EMUL_MODE_PROT32:

	if ((msr_data & 0xfffc) == 0x0)

		return emulate_gp(ctxt, 0);

		break;

	case X86EMUL_MODE_PROT64:

		if (msr_data == 0x0)

			return emulate_gp(ctxt, 0);

		break;

	default:

		break;

	}



	ctxt->eflags &= ~(EFLG_VM | EFLG_IF);

	cs_sel = (u16)msr_data;

	cs_sel &= ~SELECTOR_RPL_MASK;

	cs_sel = (u16)msr_data & ~SELECTOR_RPL_MASK;

	ss_sel = cs_sel + 8;

	ss_sel &= ~SELECTOR_RPL_MASK;

	if (ctxt->mode == X86EMUL_MODE_PROT64 || (efer & EFER_LMA)) {

	if (efer & EFER_LMA) {

		cs.d = 0;

		cs.l = 1;

	}
@@ -2386,10 +2374,11 @@ static int em_sysenter(struct x86_emulate_ctxt *ctxt) 
	ops->set_segment(ctxt, ss_sel, &ss, 0, VCPU_SREG_SS);



	ops->get_msr(ctxt, MSR_IA32_SYSENTER_EIP, &msr_data);

	ctxt->_eip = msr_data;

	ctxt->_eip = (efer & EFER_LMA) ? msr_data : (u32)msr_data;



	ops->get_msr(ctxt, MSR_IA32_SYSENTER_ESP, &msr_data);

	*reg_write(ctxt, VCPU_REGS_RSP) = msr_data;

	*reg_write(ctxt, VCPU_REGS_RSP) = (efer & EFER_LMA) ? msr_data :

							      (u32)msr_data;



	return X86EMUL_CONTINUE;

}
@@ -3791,8 +3780,8 @@ static const struct opcode group5[] = { 
};



static const struct opcode group6[] = {

	DI(Prot,	sldt),

	DI(Prot,	str),

	DI(Prot | DstMem,	sldt),

	DI(Prot | DstMem,	str),

	II(Prot | Priv | SrcMem16, em_lldt, lldt),

	II(Prot | Priv | SrcMem16, em_ltr, ltr),

	N, N, N, N,

include/trace/events/kvm.h

+9 −7
Original line number Diff line number Diff line
@@ -146,6 +146,14 @@ TRACE_EVENT(kvm_msi_set_irq, 


#if defined(CONFIG_HAVE_KVM_IRQFD)



#ifdef kvm_irqchips

#define kvm_ack_irq_string "irqchip %s pin %u"

#define kvm_ack_irq_parm  __print_symbolic(__entry->irqchip, kvm_irqchips), __entry->pin

#else

#define kvm_ack_irq_string "irqchip %d pin %u"

#define kvm_ack_irq_parm  __entry->irqchip, __entry->pin

#endif



TRACE_EVENT(kvm_ack_irq,

	TP_PROTO(unsigned int irqchip, unsigned int pin),

	TP_ARGS(irqchip, pin),
@@ -160,13 +168,7 @@ TRACE_EVENT(kvm_ack_irq, 
		__entry->pin		= pin;

	),



#ifdef kvm_irqchips

	TP_printk("irqchip %s pin %u",

		  __print_symbolic(__entry->irqchip, kvm_irqchips),

		 __entry->pin)

#else

	TP_printk("irqchip %d pin %u", __entry->irqchip, __entry->pin)

#endif

	TP_printk(kvm_ack_irq_string, kvm_ack_irq_parm)

);



#endif /* defined(CONFIG_HAVE_KVM_IRQFD) */