From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755291AbcIEIRu (ORCPT ); Mon, 5 Sep 2016 04:17:50 -0400 Received: from mout.web.de ([212.227.15.14]:64587 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754757AbcIEIRa (ORCPT ); Mon, 5 Sep 2016 04:17:30 -0400 Subject: [PATCH 4/4] x86/smpboot: Return directly after a failed kcalloc() To: x86@kernel.org, Andi Kleen , Boris Ostrovsky , Borislav Petkov , "H. Peter Anvin" , Ingo Molnar , Jiri Olsa , =?UTF-8?B?SsO8cmdlbiBHcm/Dnw==?= , Len Brown , Peter Zijlstra , Thomas Gleixner References: <6dacb257-d15c-8ea1-9dd4-0440a5ecfd1d@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall , Paolo Bonzini From: SF Markus Elfring Message-ID: Date: Mon, 5 Sep 2016 10:13:23 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <6dacb257-d15c-8ea1-9dd4-0440a5ecfd1d@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:PGqW0xdjya3XnaB8int2I6whynaobq5/c5McqBi3A+7qClgyINi MXU2jVPFI4XZLdXY9QL+/CAODTRni+Y6sbycBUn0oCf+bJxUZKM6ai+SHDpEKkvom25c2If vdExt6xNCMRIYvixLzoP4AIn4WjnaX+GrFICsj9wIcCBh6UXxuK2Z27TeANUBwD9Fxaluql VUlIk1LJrfQRZmFWJX15A== X-UI-Out-Filterresults: notjunk:1;V01:K0:UHkFUlOBFLg=:z/J6YqjJ+JfWvJJK+Kg9J7 1van4q6jwkQIIMHQLxdE1vjXfUwiRW9ygWVFoa9bo4YLn4+1Zzj6VpK9xvgVUC/az8SaM2C5L phPa6tRiC1rGbgWoEfSa1utFxd7rJ39QJfxVB9QNtBQqmmGrpWvEJMBBeGWnq0JQYrPMBrzZD 7mjw7yqIs4oCV73Y/H2nOo0AkpvzMYly7bFbMQ0Gr1dGm/5f65nEJFj2CkQD/vbA33iJTobGK kx4xfgMQGPwmMf5DXH4vKmDzgkd2xG0d5CZSYVWZf68OZNmzBy25Pp5u5/zVdMHT0LLNCxbaZ eahznIVFMbaKgLeMFAvNiExoAXcmJrKLYYp8XdVejxIteLq9/8OZWN9TLtbthgfOnkxFRQtAG FQGs5dBlCCkMfpLh3dnPZ0i7RAHBuRscRliqWFIApbb6C8c5Uh7WEqyh11qEBd1i7en5XTwvC E5XMGGXDdV9foLsMJHIpa5aB4oxBAlOvn1BAogarVa9hp0w4s/oeWUDESYvipLSGk/ttcXTQm lfs/gxfOOPsxO0my7M4T2oXFNRO5A3GL0yj5z5diPkiBlDyy42c6ANUzS92E7URE+98HOF18c jahK+QAr78OvtwVRMkdhPfmRT+1PY+r4J/dxCinlemJDB3G+9EqDeNKPpBis95ya2lXL/QdmC 5zl5s9QMmTUd3BmC/azX1idvwuX4IAornZxO2DSkxYR9iHbkXbX9ZK2TYuWT+g4q9aaPaIwK2 kfsa62Vh432kywVOdAaV+fjdHhZRbNuk6u9FCidDUSr3qeOvS67BLCfDKD5fQaC5JZviFU2vc xqLrNWg Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Mon, 5 Sep 2016 09:39:05 +0200 Return directly after a memory allocation failed in this function. Signed-off-by: Markus Elfring --- arch/x86/kernel/smpboot.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index e3fdc44..a30f625 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -359,6 +359,10 @@ static void __init smp_init_package_map(void) physical_package_map = kcalloc(BITS_TO_LONGS(max_physical_pkg_id), sizeof(*physical_package_map), GFP_KERNEL); + if (!physical_package_map) { + kfree(physical_to_logical_pkg); + return; + } for_each_present_cpu(cpu) { unsigned int apicid = apic->cpu_present_to_apicid(cpu); -- 2.9.3