Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Content-Type: text/plain;
        charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 11.1 \(3445.4.7\))
Subject: Re: [PATCH] KVM: SVM: Fix potential memory leak in svm_cpu_init()
From:   Liran Alon <liran.alon@oracle.com>
In-Reply-To: <1577931640-29420-1-git-send-email-linmiaohe@huawei.com>
Date:   Thu, 2 Jan 2020 15:22:14 +0200
Cc:     Paolo Bonzini <pbonzini@redhat.com>, rkrcmar@redhat.com,
        sean.j.christopherson@intel.com, vkuznets@redhat.com,
        wanpengli@tencent.com, jmattson@google.com, joro@8bytes.org,
        tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, hpa@zytor.com,
        kvm@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org
Content-Transfer-Encoding: 7bit
Message-Id: <BEE0CD6D-B921-4FFE-ADD6-76A7A170C2B0@oracle.com>
References: <1577931640-29420-1-git-send-email-linmiaohe@huawei.com>
To:     linmiaohe <linmiaohe@huawei.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


> On 2 Jan 2020, at 4:20, linmiaohe <linmiaohe@huawei.com> wrote:
> 
> From: Miaohe Lin <linmiaohe@huawei.com>
> 
> When kmalloc memory for sd->sev_vmcbs failed, we forget to free the page
> held by sd->save_area.
> 
> Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>

Reviewed-by: Liran Alon <liran.alon@oracle.com>

-Liran

> ---
> arch/x86/kvm/svm.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
> index 8f1b715dfde8..89eb382e8580 100644
> --- a/arch/x86/kvm/svm.c
> +++ b/arch/x86/kvm/svm.c
> @@ -1012,7 +1012,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 free_cpu_data;
> 
> 	if (svm_sev_enabled()) {
> 		r = -ENOMEM;
> @@ -1020,14 +1020,16 @@ static int svm_cpu_init(int cpu)
> 					      sizeof(void *),
> 					      GFP_KERNEL);
> 		if (!sd->sev_vmcbs)
> -			goto err_1;
> +			goto free_save_area;
> 	}
> 
> 	per_cpu(svm_data, cpu) = sd;
> 
> 	return 0;
> 
> -err_1:
> +free_save_area:
> +	__free_page(sd->save_area);
> +free_cpu_data:
> 	kfree(sd);
> 	return r;
> 
> -- 
> 2.19.1
>