From: Avi Kivity Date: Mon, 23 Mar 2009 20:13:44 +0000 (+0200) Subject: KVM: VMX: Don't allow uninhibited access to EFER on i386 X-Git-Tag: kvm-85rc2~13 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ba4e109af1542c91c750179a6a539d0a13a0e4c2;p=users%2Fdwmw2%2Flinux.git KVM: VMX: Don't allow uninhibited access to EFER on i386 vmx_set_msr() does not allow i386 guests to touch EFER, but they can still do so through the default: label in the switch. If they set EFER_LME, they can oops the host. Fix by having EFER access through the normal channel (which will check for EFER_LME) even on i386. Reported-and-tested-by: Benjamin Gilbert Cc: stable@kernel.org Signed-off-by: Avi Kivity --- diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 88ef0947782fa..da6461d5dc84a 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -942,11 +942,11 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data) int ret = 0; switch (msr_index) { -#ifdef CONFIG_X86_64 case MSR_EFER: vmx_load_host_state(vmx); ret = kvm_set_msr_common(vcpu, msr_index, data); break; +#ifdef CONFIG_X86_64 case MSR_FS_BASE: vmcs_writel(GUEST_FS_BASE, data); break;