FAILED: patch "[PATCH] x86: KVM: svm: Fix a check in nested_svm_vmrun()" failed to apply to 5.3-stable tree
The patch below does not apply to the 5.3-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From a061985b81a20248da60589d01375ebe9bec4dfc Mon Sep 17 00:00:00 2001
From: Dan Carpenter dan.carpenter@oracle.com Date: Tue, 27 Aug 2019 12:38:52 +0300 Subject: [PATCH] x86: KVM: svm: Fix a check in nested_svm_vmrun()
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()") Cc: stable@vger.kernel.org Signed-off-by: Dan Carpenter dan.carpenter@oracle.com Reviewed-by: Vitaly Kuznetsov vkuznets@redhat.com Reviewed-by: Sean Christopherson sean.j.christopherson@intel.com Signed-off-by: Paolo Bonzini pbonzini@redhat.com
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index fdeaf8f44949..2854aafc489e 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) {
gregkh@linuxfoundation.org writes:
The patch below does not apply to the 5.3-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From a061985b81a20248da60589d01375ebe9bec4dfc Mon Sep 17 00:00:00 2001 From: Dan Carpenter dan.carpenter@oracle.com Date: Tue, 27 Aug 2019 12:38:52 +0300 Subject: [PATCH] x86: KVM: svm: Fix a check in nested_svm_vmrun()
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()")
Hm, this commit wasn't backported to 5.3-stable so no fix is needed (scripts don't check pre-requisites like commits mentioned in Fixes:?)
Also, c8e16b78c614 is not a stable@ candidate IMO.
Cc: stable@vger.kernel.org
This wasn't needed as it's only 5.4 which will have the offending commit and the fix.
Signed-off-by: Dan Carpenter dan.carpenter@oracle.com Reviewed-by: Vitaly Kuznetsov vkuznets@redhat.com Reviewed-by: Sean Christopherson sean.j.christopherson@intel.com Signed-off-by: Paolo Bonzini pbonzini@redhat.com
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index fdeaf8f44949..2854aafc489e 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) {
On Thu, Oct 03, 2019 at 11:19:45AM +0200, Vitaly Kuznetsov wrote:
gregkh@linuxfoundation.org writes:
The patch below does not apply to the 5.3-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From a061985b81a20248da60589d01375ebe9bec4dfc Mon Sep 17 00:00:00 2001 From: Dan Carpenter dan.carpenter@oracle.com Date: Tue, 27 Aug 2019 12:38:52 +0300 Subject: [PATCH] x86: KVM: svm: Fix a check in nested_svm_vmrun()
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()")
Hm, this commit wasn't backported to 5.3-stable so no fix is needed (scripts don't check pre-requisites like commits mentioned in Fixes:?)
Also, c8e16b78c614 is not a stable@ candidate IMO.
Cc: stable@vger.kernel.org
This wasn't needed as it's only 5.4 which will have the offending commit and the fix.
Yes, I saw that, but as it was explicitly marked for the stable tree, I wanted to verify that this really was not needed here.
thanks
greg k-h
linux-stable-mirror@lists.linaro.org
-
Greg KH -
gregkh＠linuxfoundation.org
-
Vitaly Kuznetsov