| From 66f61c92889ff3ca365161fb29dd36d6354682ba Mon Sep 17 00:00:00 2001 |
| From: Paolo Bonzini <pbonzini@redhat.com> |
| Date: Fri, 24 May 2019 21:52:46 +0200 |
| Subject: KVM: x86: fix return value for reserved EFER |
| |
| From: Paolo Bonzini <pbonzini@redhat.com> |
| |
| commit 66f61c92889ff3ca365161fb29dd36d6354682ba upstream. |
| |
| Commit 11988499e62b ("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: 11988499e62b ("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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/x86/kvm/x86.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/arch/x86/kvm/x86.c |
| +++ b/arch/x86/kvm/x86.c |
| @@ -1288,7 +1288,7 @@ static int set_efer(struct kvm_vcpu *vcp |
| 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)) |
