提交 262d517b 编写于 作者: M Miaohe Lin 提交者: Shile Zhang

KVM: SVM: Fix potential memory leak in svm_cpu_init()

to #27338374

commit d80b64ff297e40c2b6f7d7abc1b3eba70d22a068 upstream.

When kmalloc memory for sd->sev_vmcbs failed, we forget to free the page
held by sd->save_area. Also get rid of the var r as '-ENOMEM' is actually
the only possible outcome here.
Reviewed-by: NLiran Alon <liran.alon@oracle.com>
Reviewed-by: NVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: NMiaohe Lin <linmiaohe@huawei.com>
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Cc: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Reference: CVE-2020-12768
Signed-off-by: NShile Zhang <shile.zhang@linux.alibaba.com>
Acked-by: NJoseph Qi <joseph.qi@linux.alibaba.com>
上级 2d4b9c66
...@@ -999,33 +999,32 @@ static void svm_cpu_uninit(int cpu) ...@@ -999,33 +999,32 @@ static void svm_cpu_uninit(int cpu)
static int svm_cpu_init(int cpu) static int svm_cpu_init(int cpu)
{ {
struct svm_cpu_data *sd; struct svm_cpu_data *sd;
int r;
sd = kzalloc(sizeof(struct svm_cpu_data), GFP_KERNEL); sd = kzalloc(sizeof(struct svm_cpu_data), GFP_KERNEL);
if (!sd) if (!sd)
return -ENOMEM; return -ENOMEM;
sd->cpu = cpu; sd->cpu = cpu;
r = -ENOMEM;
sd->save_area = alloc_page(GFP_KERNEL); sd->save_area = alloc_page(GFP_KERNEL);
if (!sd->save_area) if (!sd->save_area)
goto err_1; goto free_cpu_data;
if (svm_sev_enabled()) { if (svm_sev_enabled()) {
r = -ENOMEM;
sd->sev_vmcbs = kmalloc_array(max_sev_asid + 1, sd->sev_vmcbs = kmalloc_array(max_sev_asid + 1,
sizeof(void *), sizeof(void *),
GFP_KERNEL); GFP_KERNEL);
if (!sd->sev_vmcbs) if (!sd->sev_vmcbs)
goto err_1; goto free_save_area;
} }
per_cpu(svm_data, cpu) = sd; per_cpu(svm_data, cpu) = sd;
return 0; return 0;
err_1: free_save_area:
__free_page(sd->save_area);
free_cpu_data:
kfree(sd); kfree(sd);
return r; return -ENOMEM;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册