Commit 7a611e69 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a16d9d25 1d92128f

arch/x86/kvm/x86.c

+3 −0
Original line number Diff line number Diff line
@@ -2000,6 +2000,9 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata) 
	case MSR_KVM_STEAL_TIME:

		data = vcpu->arch.st.msr_val;

		break;

	case MSR_KVM_PV_EOI_EN:

		data = vcpu->arch.pv_eoi.msr_val;

		break;

	case MSR_IA32_P5_MC_ADDR:

	case MSR_IA32_P5_MC_TYPE:

	case MSR_IA32_MCG_CAP:

virt/kvm/kvm_main.c

+4 −3
Original line number Diff line number Diff line
@@ -1976,9 +1976,10 @@ static long kvm_vcpu_compat_ioctl(struct file *filp, 
			if (copy_from_user(&csigset, sigmask_arg->sigset,

					   sizeof csigset))

				goto out;

		}

			sigset_from_compat(&sigset, &csigset);

			r = kvm_vcpu_ioctl_set_sigmask(vcpu, &sigset);

		} else

			r = kvm_vcpu_ioctl_set_sigmask(vcpu, NULL);

		break;

	}

	default: