[PATCH 4.19 223/271] x86/boot: Fix memory leak in default_get_smp_config()

[Greg Kroah-Hartman]

From: David Rientjes <rient...@google.com>

commit e74bd96989dd42a51a73eddb4a5510a6f5e42ac3 upstream.

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: 5997efb96756 ("x86/boot: Use memremap() to map the MPF and MPC data")
Reported-by: Cfir Cohen <c...@google.com>
Signed-off-by: David Rientjes <rient...@google.com>
Signed-off-by: Thomas Gleixner <t...@linutronix.de>
Cc: sta...@vger.kernel.org
Link: 
https://lkml.kernel.org/r/alpine.deb.2.21.1907091942570.28...@chino.kir.corp.google.com
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 arch/x86/kernel/mpparse.c |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -547,17 +547,15 @@ void __init default_get_smp_config(unsig
                         * local APIC has default address
                         */
                        mp_lapic_addr = APIC_DEFAULT_PHYS_BASE;
-                       return;
+                       goto out;
                }
 
                pr_info("Default MP configuration #%d\n", mpf->feature1);
                construct_default_ISA_mptable(mpf->feature1);
 
        } else if (mpf->physptr) {
-               if (check_physptr(mpf, early)) {
-                       early_memunmap(mpf, sizeof(*mpf));
-                       return;
-               }
+               if (check_physptr(mpf, early))
+                       goto out;
        } else
                BUG();
 
@@ -566,7 +564,7 @@ void __init default_get_smp_config(unsig
        /*
         * Only use the first configuration found.
         */
-
+out:
        early_memunmap(mpf, sizeof(*mpf));
 }