From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 370C0C43381 for ; Tue, 26 Mar 2019 16:11:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0E24C20863 for ; Tue, 26 Mar 2019 16:11:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731701AbfCZQLD (ORCPT ); Tue, 26 Mar 2019 12:11:03 -0400 Received: from terminus.zytor.com ([198.137.202.136]:35123 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726258AbfCZQLD (ORCPT ); Tue, 26 Mar 2019 12:11:03 -0400 Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.15.2/8.15.2) with ESMTPS id x2QGA7QW2468380 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Tue, 26 Mar 2019 09:10:07 -0700 Received: (from tipbot@localhost) by terminus.zytor.com (8.15.2/8.15.2/Submit) id x2QGA58l2468375; Tue, 26 Mar 2019 09:10:05 -0700 Date: Tue, 26 Mar 2019 09:10:05 -0700 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for Kangjie Lu Message-ID: Cc: nstange@suse.de, kjlu@umn.edu, hpa@zytor.com, dvhart@infradead.org, x86@kernel.org, andy@infradead.org, bp@suse.de, colin.king@canonical.com, linux-kernel@vger.kernel.org, gustavo@embeddedor.com, mingo@redhat.com, keescook@chromium.org, mingo@kernel.org, tglx@linutronix.de, rvarsha016@gmail.com, abanman@hpe.com, mike.travis@hpe.com Reply-To: colin.king@canonical.com, linux-kernel@vger.kernel.org, gustavo@embeddedor.com, x86@kernel.org, andy@infradead.org, bp@suse.de, dvhart@infradead.org, nstange@suse.de, kjlu@umn.edu, hpa@zytor.com, rvarsha016@gmail.com, abanman@hpe.com, mike.travis@hpe.com, mingo@kernel.org, tglx@linutronix.de, mingo@redhat.com, keescook@chromium.org In-Reply-To: <20190325202924.4624-1-kjlu@umn.edu> References: <20190325202924.4624-1-kjlu@umn.edu> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/cleanups] x86/platform/uv: Fix missing checks of kcalloc() return values Git-Commit-ID: 766460852cfaeca4042e5f3aeb9616b3689147bc X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 766460852cfaeca4042e5f3aeb9616b3689147bc Gitweb: https://git.kernel.org/tip/766460852cfaeca4042e5f3aeb9616b3689147bc Author: Kangjie Lu AuthorDate: Mon, 25 Mar 2019 15:29:22 -0500 Committer: Borislav Petkov CommitDate: Tue, 26 Mar 2019 17:01:30 +0100 x86/platform/uv: Fix missing checks of kcalloc() return values Handle potential errors returned from kcalloc(). [ bp: rewrite commit message. ] Signed-off-by: Kangjie Lu Signed-off-by: Borislav Petkov Cc: Andrew Banman Cc: Andy Shevchenko Cc: Colin Ian King Cc: Darren Hart Cc: "Gustavo A. R. Silva" Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Kees Cook Cc: Mike Travis Cc: Nicolai Stange Cc: pakki001@umn.edu Cc: platform-driver-x86@vger.kernel.org Cc: Thomas Gleixner Cc: Varsha Rao Cc: x86-ml Link: https://lkml.kernel.org/r/20190325202924.4624-1-kjlu@umn.edu --- arch/x86/platform/uv/tlb_uv.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c index 2c53b0f19329..1297e185b8c8 100644 --- a/arch/x86/platform/uv/tlb_uv.c +++ b/arch/x86/platform/uv/tlb_uv.c @@ -2133,14 +2133,19 @@ static int __init summarize_uvhub_sockets(int nuvhubs, */ static int __init init_per_cpu(int nuvhubs, int base_part_pnode) { - unsigned char *uvhub_mask; struct uvhub_desc *uvhub_descs; + unsigned char *uvhub_mask = NULL; if (is_uv3_hub() || is_uv2_hub() || is_uv1_hub()) timeout_us = calculate_destination_timeout(); uvhub_descs = kcalloc(nuvhubs, sizeof(struct uvhub_desc), GFP_KERNEL); + if (!uvhub_descs) + goto fail; + uvhub_mask = kzalloc((nuvhubs+7)/8, GFP_KERNEL); + if (!uvhub_mask) + goto fail; if (get_cpu_topology(base_part_pnode, uvhub_descs, uvhub_mask)) goto fail;