tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull KVM bugfixes from Marcelo Tosatti.

* git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: x86: fix KVM_GET_MSR for PV EOI
kvm: Fix nonsense handling of compat ioctl

Linus Torvalds 7a611e69 a16d9d25

+7 -3
+3
arch/x86/kvm/x86.c
··· 2000 2000 case MSR_KVM_STEAL_TIME: 2001 2001 data = vcpu->arch.st.msr_val; 2002 2002 break; 2003 + case MSR_KVM_PV_EOI_EN: 2004 + data = vcpu->arch.pv_eoi.msr_val; 2005 + break; 2003 2006 case MSR_IA32_P5_MC_ADDR: 2004 2007 case MSR_IA32_P5_MC_TYPE: 2005 2008 case MSR_IA32_MCG_CAP:
+4 -3
virt/kvm/kvm_main.c
··· 1976 1976 if (copy_from_user(&csigset, sigmask_arg->sigset, 1977 1977 sizeof csigset)) 1978 1978 goto out; 1979 - } 1980 - sigset_from_compat(&sigset, &csigset); 1981 - r = kvm_vcpu_ioctl_set_sigmask(vcpu, &sigset); 1979 + sigset_from_compat(&sigset, &csigset); 1980 + r = kvm_vcpu_ioctl_set_sigmask(vcpu, &sigset); 1981 + } else 1982 + r = kvm_vcpu_ioctl_set_sigmask(vcpu, NULL); 1982 1983 break; 1983 1984 } 1984 1985 default: