Re: [PATCH][v2] KVM: fix error handling in svm_cpu_init

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Li RongQing <lirongqing@xxxxxxxxx> writes:

> sd->save_area should be freed in error path

> rename labels to make them readable suggested by Vitaly

(minor nitpick, not worth resending the patch IMO)
This comment is only helpfull after '---' so reviewers know what changed
between version. It makes little sense when you see this later in 'git log'.

>
> Fixes: 70cd94e60c733 ("KVM: SVM: VMRUN should use associated ASID when SEV is enabled")
> Signed-off-by: Li RongQing <lirongqing@xxxxxxxxx>
> Reviewed-by: Brijesh Singh <brijesh.singh@xxxxxxx>
> Cc: Vitaly Kuznetsov <vkuznets@xxxxxxxxxx>
> ---
> v1-->v2: rename labels to make them readable suggested by Vitaly
>
>  arch/x86/kvm/svm.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
> index f13a3a24d360..c6613d1dfa75 100644
> --- a/arch/x86/kvm/svm.c
> +++ b/arch/x86/kvm/svm.c
> @@ -998,7 +998,7 @@ static int svm_cpu_init(int cpu)
>  	r = -ENOMEM;
>  	sd->save_area = alloc_page(GFP_KERNEL);
>  	if (!sd->save_area)
> -		goto err_1;
> +		goto err_free_sd;
>  
>  	if (svm_sev_enabled()) {
>  		r = -ENOMEM;
> @@ -1006,17 +1006,18 @@ static int svm_cpu_init(int cpu)
>  					      sizeof(void *),
>  					      GFP_KERNEL);
>  		if (!sd->sev_vmcbs)
> -			goto err_1;
> +			goto err_free_saved_area;
>  	}
>  
>  	per_cpu(svm_data, cpu) = sd;
>  
>  	return 0;
>  
> -err_1:
> +err_free_saved_area:
> +	__free_page(sd->save_area);
> +err_free_sd:
>  	kfree(sd);
>  	return r;
> -
>  }
>  
>  static bool valid_msr_intercept(u32 index)

Reviewed-by: Vitaly Kuznetsov <vkuznets@xxxxxxxxxx>

-- 
Vitaly



[Index of Archives]     [KVM ARM]     [KVM ia64]     [KVM ppc]     [Virtualization Tools]     [Spice Development]     [Libvirt]     [Libvirt Users]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite Questions]     [Linux Kernel]     [Linux SCSI]     [XFree86]

  Powered by Linux