From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755211AbcIEIOZ (ORCPT ); Mon, 5 Sep 2016 04:14:25 -0400 Received: from mout.web.de ([212.227.15.3]:52812 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753676AbcIEIOW (ORCPT ); Mon, 5 Sep 2016 04:14:22 -0400 Subject: [PATCH 2/4] x86/smpboot: Return directly after a failed kmalloc_array() 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:11:21 +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:0kAnnL/qFkyfGTFQekDkK4vOFYZY7d1neMkEOPdisg26D7PMb31 XZEOKqdW/Ry9RUcba6kXK3o5EYuC7yqjujDjws6kjpEyeeoiH68AkCuG2j4s5FGO6FxWoiV KWzo8ppYRL08rjuwZLuYITyuzThIETU1s9if/cMl5CnGWU1SK+E+BompGaDEk03/iqcIQ37 ixmAUYy00mAXMu81Ws5tg== X-UI-Out-Filterresults: notjunk:1;V01:K0:VkcKV4He08w=:KqYOhzhwpQ9o5iA5d2LMg5 XmRiTYEkm9jD657BLe9MwjA9zmcZcGTGTT2cWItxsXh6citXMrL0kF+CTfE2jJf1UcZ2y7zjk p8gh2Sl1+lhXjpswURBtYMO7ei7HJcmkhHW5eZUHnljDrqsUO4js1UgthpefuAl06R0zbvWMA mORBlhXkn6xEBD2k5ElquaNKKU8dkBh8E1Hza5cu4kplKA4vqSoU7vsvQQe3CVAcpYSACPa0L kwiwSO2AI2Kdbj4s1em5twR2/JBcWdS9bkbsXlbbOApVaaNXYUdtOUt21QzdFSaatEvJo/9Rt qevpi2DxtkoSqifWKaldbdhLh08bH06gAOXVmhTbtgmxBo3DtYae9sPoQuJSQI3C9tTlecdbW 3eRBvyWlQ2FAr/WzJsFQuBAYSWKEC4Ehy04PxLyzi0EyceD7473eu/iEutu6MGTOD3AjNksKc zoKd1i+Af3BpBnIR2FQzDPcSXJ5BuAQwKXwj+6FQRMMOVN1lIQGWsX9lPr14SMSrxswQBsNUc 0BkOAfKHMB4L52VF20HhJUfWEzu+qcCJl4CdfIyKTuD6PAhm+UYxjZQDYWh0fQMHKPKJ4cjNf aWA7zXxU8U9Y0V4EMN5yBuNwrQzMM8AHBJSqQbHz5o0nSknLiF6ZciM8NpzDpszvOEjPwiolL lrcYkw5CXO+FqkxNjiwI+QtGNIXDcyXZsHBJgVk9g/09nNbYqzKEi1HKOmTZOtcmktHpdczxZ DPiAr8Dtxui0au027Ud3CEmXnf2rTRA8tzSlxE2wlZwUjAL2Od/EKsMBYHwUST6xHq9UXiput kH/Yqd8 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 08:48:32 +0200 Return directly after a memory allocation failed at the beginning. Signed-off-by: Markus Elfring --- arch/x86/kernel/smpboot.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 36cf27e..2ce06ef 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -352,6 +352,8 @@ static void __init smp_init_package_map(void) physical_to_logical_pkg = kmalloc_array(max_physical_pkg_id, sizeof(*physical_to_logical_pkg), GFP_KERNEL); + if (!physical_to_logical_pkg) + return; memset(physical_to_logical_pkg, 0xff, sizeof(*physical_to_logical_pkg) * max_physical_pkg_id); -- 2.9.3