Drop "KVM: SVM: Fix potential memory leak in svm_cpu_init()"
This commit is contained in:
parent
14807e183a
commit
ce4504d627
|
@ -312,7 +312,6 @@ linux (4.19.125-1) UNRELEASED; urgency=medium
|
||||||
- x86/uaccess, ubsan: Fix UBSAN vs. SMAP
|
- x86/uaccess, ubsan: Fix UBSAN vs. SMAP
|
||||||
- ubsan: build ubsan.c more conservatively
|
- ubsan: build ubsan.c more conservatively
|
||||||
- i2c: dev: Fix the race between the release of i2c_dev and cdev
|
- i2c: dev: Fix the race between the release of i2c_dev and cdev
|
||||||
- KVM: SVM: Fix potential memory leak in svm_cpu_init()
|
|
||||||
- riscv: set max_pfn to the PFN of the last page
|
- riscv: set max_pfn to the PFN of the last page
|
||||||
- ima: Set file->f_mode instead of file->f_flags in ima_calc_file_hash()
|
- ima: Set file->f_mode instead of file->f_flags in ima_calc_file_hash()
|
||||||
- evm: Check also if *tfm is an error pointer in init_desc()
|
- evm: Check also if *tfm is an error pointer in init_desc()
|
||||||
|
|
|
@ -1,65 +0,0 @@
|
||||||
From: Miaohe Lin <linmiaohe@huawei.com>
|
|
||||||
Date: Sat, 4 Jan 2020 16:56:49 +0800
|
|
||||||
Subject: KVM: SVM: Fix potential memory leak in svm_cpu_init()
|
|
||||||
Origin: https://git.kernel.org/linus/d80b64ff297e40c2b6f7d7abc1b3eba70d22a068
|
|
||||||
Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2020-12768
|
|
||||||
|
|
||||||
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: Liran Alon <liran.alon@oracle.com>
|
|
||||||
Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
||||||
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
|
|
||||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
||||||
---
|
|
||||||
arch/x86/kvm/svm.c | 13 ++++++-------
|
|
||||||
1 file changed, 6 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
|
|
||||||
index 8787a123b8e7..ff02aeb23616 100644
|
|
||||||
--- a/arch/x86/kvm/svm.c
|
|
||||||
+++ b/arch/x86/kvm/svm.c
|
|
||||||
@@ -1005,33 +1005,32 @@ static void svm_cpu_uninit(int cpu)
|
|
||||||
static int svm_cpu_init(int cpu)
|
|
||||||
{
|
|
||||||
struct svm_cpu_data *sd;
|
|
||||||
- int r;
|
|
||||||
|
|
||||||
sd = kzalloc(sizeof(struct svm_cpu_data), GFP_KERNEL);
|
|
||||||
if (!sd)
|
|
||||||
return -ENOMEM;
|
|
||||||
sd->cpu = 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;
|
|
||||||
sd->sev_vmcbs = kmalloc_array(max_sev_asid + 1,
|
|
||||||
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;
|
|
||||||
+ return -ENOMEM;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
2.27.0.rc0
|
|
||||||
|
|
|
@ -296,7 +296,6 @@ features/arm/staging-vc04_services-Use-correct-cache-line-size.patch
|
||||||
# Security fixes
|
# Security fixes
|
||||||
debian/i386-686-pae-pci-set-pci-nobios-by-default.patch
|
debian/i386-686-pae-pci-set-pci-nobios-by-default.patch
|
||||||
debian/ntfs-mark-it-as-broken.patch
|
debian/ntfs-mark-it-as-broken.patch
|
||||||
bugfix/x86/kvm-svm-fix-potential-memory-leak-in-svm_cpu_init.patch
|
|
||||||
bugfix/all/fs-binfmt_elf.c-allocate-initialized-memory-in-fill_.patch
|
bugfix/all/fs-binfmt_elf.c-allocate-initialized-memory-in-fill_.patch
|
||||||
bugfix/all/kernel-relay.c-handle-alloc_percpu-returning-NULL-in.patch
|
bugfix/all/kernel-relay.c-handle-alloc_percpu-returning-NULL-in.patch
|
||||||
bugfix/all/mm-Fix-mremap-not-considering-huge-pmd-devmap.patch
|
bugfix/all/mm-Fix-mremap-not-considering-huge-pmd-devmap.patch
|
||||||
|
|
Loading…
Reference in New Issue