| Message ID | 20190827093852.GA8443@mwanda (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | x86: KVM: svm: Fix a check in nested_svm_vmrun() | expand |
Dan Carpenter <dan.carpenter@oracle.com> writes: > We refactored this code a bit and accidentally deleted the "-" character > from "-EINVAL". The kvm_vcpu_map() function never returns positive > EINVAL. > > Fixes: c8e16b78c614 ("x86: KVM: svm: eliminate hardcoded RIP advancement from vmrun_interception()") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > From static analysis. I don't really know the impact. > > > arch/x86/kvm/svm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c > index 1f220a85514f..ef646e22d1ab 100644 > --- a/arch/x86/kvm/svm.c > +++ b/arch/x86/kvm/svm.c > @@ -3598,7 +3598,7 @@ static int nested_svm_vmrun(struct vcpu_svm *svm) > vmcb_gpa = svm->vmcb->save.rax; > > ret = kvm_vcpu_map(&svm->vcpu, gpa_to_gfn(vmcb_gpa), &map); > - if (ret == EINVAL) { > + if (ret == -EINVAL) { > kvm_inject_gp(&svm->vcpu, 0); > return 1; > } else if (ret) { I was hoping that my patch was OK and Paolo screwed it upon commit but no, it's the same in my local branch and I'm left without excuses :-) Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
On Tue, Aug 27, 2019 at 12:38:52PM +0300, Dan Carpenter wrote: > We refactored this code a bit and accidentally deleted the "-" character > from "-EINVAL". The kvm_vcpu_map() function never returns positive > EINVAL. > > Fixes: c8e16b78c614 ("x86: KVM: svm: eliminate hardcoded RIP advancement from vmrun_interception()") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- Reviewed-by: Sean Christopherson <sean.j.christopherson@intel.com>
On 27/08/19 11:38, Dan Carpenter wrote: > We refactored this code a bit and accidentally deleted the "-" character > from "-EINVAL". The kvm_vcpu_map() function never returns positive > EINVAL. > > Fixes: c8e16b78c614 ("x86: KVM: svm: eliminate hardcoded RIP advancement from vmrun_interception()") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > From static analysis. I don't really know the impact. > > > arch/x86/kvm/svm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c > index 1f220a85514f..ef646e22d1ab 100644 > --- a/arch/x86/kvm/svm.c > +++ b/arch/x86/kvm/svm.c > @@ -3598,7 +3598,7 @@ static int nested_svm_vmrun(struct vcpu_svm *svm) > vmcb_gpa = svm->vmcb->save.rax; > > ret = kvm_vcpu_map(&svm->vcpu, gpa_to_gfn(vmcb_gpa), &map); > - if (ret == EINVAL) { > + if (ret == -EINVAL) { > kvm_inject_gp(&svm->vcpu, 0); > return 1; > } else if (ret) { > Queued, thanks. Paolo
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 1f220a85514f..ef646e22d1ab 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -3598,7 +3598,7 @@ static int nested_svm_vmrun(struct vcpu_svm *svm) vmcb_gpa = svm->vmcb->save.rax; ret = kvm_vcpu_map(&svm->vcpu, gpa_to_gfn(vmcb_gpa), &map); - if (ret == EINVAL) { + if (ret == -EINVAL) { kvm_inject_gp(&svm->vcpu, 0); return 1; } else if (ret) {
We refactored this code a bit and accidentally deleted the "-" character from "-EINVAL". The kvm_vcpu_map() function never returns positive EINVAL. Fixes: c8e16b78c614 ("x86: KVM: svm: eliminate hardcoded RIP advancement from vmrun_interception()") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- From static analysis. I don't really know the impact. arch/x86/kvm/svm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)