mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-28 23:24:50 +00:00
Code Issues Releases Wiki Activity

x86/boot: Fix memory leak in default_get_smp_config()

Browse source 
When default_get_smp_config() is called with early == 1 and mpf->feature1
is non-zero, mpf is leaked because the return path does not do
early_memunmap().

Fix this and share a common exit routine.

Fixes: 5997efb967 ("x86/boot: Use memremap() to map the MPF and MPC data")
Reported-by: Cfir Cohen <cfir@google.com>
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/alpine.DEB.2.21.1907091942570.28240@chino.kir.corp.google.com
This commit is contained in:
David Rientjes 2019-07-09 19:44:03 -07:00 committed by Thomas Gleixner
parent c7ca0b6145
commit e74bd96989
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/x86/kernel/mpparse.c
View file

@ -546,17 +546,15 @@ void __init default_get_smp_config(unsigned int early)
* local APIC has default address * local APIC has default address
*/ */
mp_lapic_addr = APIC_DEFAULT_PHYS_BASE; mp_lapic_addr = APIC_DEFAULT_PHYS_BASE;
return; goto out;
} }
pr_info("Default MP configuration #%d\n", mpf->feature1); pr_info("Default MP configuration #%d\n", mpf->feature1);
construct_default_ISA_mptable(mpf->feature1); construct_default_ISA_mptable(mpf->feature1);
} else if (mpf->physptr) { } else if (mpf->physptr) {
if (check_physptr(mpf, early)) { if (check_physptr(mpf, early))
early_memunmap(mpf, sizeof(*mpf)); goto out;
return;
}
} else } else
BUG(); BUG();
@ -565,7 +563,7 @@ void __init default_get_smp_config(unsigned int early)
/* /*
* Only use the first configuration found. * Only use the first configuration found.
*/ */
out:
early_memunmap(mpf, sizeof(*mpf)); early_memunmap(mpf, sizeof(*mpf));
} }