Commit 66f61c92 authored May 24, 2019 by Paolo Bonzini

KVM: x86: fix return value for reserved EFER



Commit 11988499 ("KVM: x86: Skip EFER vs. guest CPUID checks for
host-initiated writes", 2019-04-02) introduced a "return false" in a
function returning int, and anyway set_efer has a "nonzero on error"
conventon so it should be returning 1.

Reported-by: Pavel Machek <pavel@denx.de>
Fixes: 11988499 ("KVM: x86: Skip EFER vs. guest CPUID checks for host-initiated writes")
Cc: Sean Christopherson <sean.j.christopherson@intel.com>
Cc: stable@vger.kernel.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 883d25e7

arch/x86/kvm/x86.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1298,7 +1298,7 @@ static int set_efer(struct kvm_vcpu vcpu, struct msr_data msr_info)
		u64 efer = msr_info->data;

		if (efer & efer_reserved_bits)
		return false;
		return 1;

		if (!msr_info->host_initiated) {
		if (!__kvm_valid_efer(vcpu, efer))