2020-11-17 02:54:34

by chenzhou

Subject: [PATCH] KVM: SVM: fix error return code in svm_create_vcpu()

Fix to return a negative error code from the error handling case
instead of 0 in function svm_create_vcpu(), as done elsewhere in this
function.

Fixes: f4c847a95654 ("KVM: SVM: refactor msr permission bitmap allocation")
Reported-by: Hulk Robot <[email protected]>
Signed-off-by: Chen Zhou <[email protected]>
---
arch/x86/kvm/svm/svm.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index 1e81cfebd491..79b3a564f1c9 100644
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -1309,8 +1309,10 @@ static int svm_create_vcpu(struct kvm_vcpu *vcpu)
svm->avic_is_running = true;

svm->msrpm = svm_vcpu_alloc_msrpm();
- if (!svm->msrpm)
+ if (!svm->msrpm) {
+ err = -ENOMEM;
goto error_free_vmcb_page;
+ }

svm_vcpu_init_msrpm(vcpu, svm->msrpm);

--
2.20.1

2020-11-17 07:42:22

by Paolo Bonzini

Subject: Re: [PATCH] KVM: SVM: fix error return code in svm_create_vcpu()

On 17/11/20 03:54, Chen Zhou wrote:
> Fix to return a negative error code from the error handling case
> instead of 0 in function svm_create_vcpu(), as done elsewhere in this
> function.
>
> Fixes: f4c847a95654 ("KVM: SVM: refactor msr permission bitmap allocation")
> Reported-by: Hulk Robot <[email protected]>
> Signed-off-by: Chen Zhou <[email protected]>
> ---
> arch/x86/kvm/svm/svm.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
> index 1e81cfebd491..79b3a564f1c9 100644
> --- a/arch/x86/kvm/svm/svm.c
> +++ b/arch/x86/kvm/svm/svm.c
> @@ -1309,8 +1309,10 @@ static int svm_create_vcpu(struct kvm_vcpu *vcpu)
> svm->avic_is_running = true;
>
> svm->msrpm = svm_vcpu_alloc_msrpm();
> - if (!svm->msrpm)
> + if (!svm->msrpm) {
> + err = -ENOMEM;
> goto error_free_vmcb_page;
> + }
>
> svm_vcpu_init_msrpm(vcpu, svm->msrpm);
>
>

Queued, thanks.

Paolo