From patchwork Sat Mar 2 21:09:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aditya Pakki X-Patchwork-Id: 10836755 X-Patchwork-Delegate: andy.shevchenko@gmail.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1F73C1390 for ; Sat, 2 Mar 2019 21:19:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F33AD2A2A7 for ; Sat, 2 Mar 2019 21:19:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E2D2D2A29B; Sat, 2 Mar 2019 21:19:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C7682A29B for ; Sat, 2 Mar 2019 21:19:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726592AbfCBVTK (ORCPT ); Sat, 2 Mar 2019 16:19:10 -0500 Received: from mta-p7.oit.umn.edu ([134.84.196.207]:51872 "EHLO mta-p7.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726538AbfCBVTK (ORCPT ); Sat, 2 Mar 2019 16:19:10 -0500 X-Greylist: delayed 595 seconds by postgrey-1.27 at vger.kernel.org; Sat, 02 Mar 2019 16:19:09 EST Received: from localhost (unknown [127.0.0.1]) by mta-p7.oit.umn.edu (Postfix) with ESMTP id 97C569CE for ; Sat, 2 Mar 2019 21:09:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p7.oit.umn.edu ([127.0.0.1]) by localhost (mta-p7.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id z2TNfM0IuIGg for ; Sat, 2 Mar 2019 15:09:14 -0600 (CST) Received: from mail-io1-f72.google.com (mail-io1-f72.google.com [209.85.166.72]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p7.oit.umn.edu (Postfix) with ESMTPS id 6616E614 for ; Sat, 2 Mar 2019 15:09:14 -0600 (CST) Received: by mail-io1-f72.google.com with SMTP id p12so1287082iod.14 for ; Sat, 02 Mar 2019 13:09:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id; bh=1TRUIjFY0f/8rv7vnlDfvrnlRzzApzrPDwcr+VzHvIw=; b=LpVzfaHp9ry4mfas1XgKpjEVSWy6A+CNdGbE8RNxdgm+5ibI76TZRdMNre9o5RTrFR UHVYvpb2AhlHzszBDZ0AOQ+5i2JGZ2bhGGN3WQ78r/js4O0nFPZuJm8zLSa1J58H1DFz EOibTRsgJHznjToq4wazT/Lw71yOKAHInGKaCmDmsipGhbSmAeomKVqviSCFltTnCtFQ y9Gp65e4szp+bUpEmZHTnHEOTtTjrMKo32iO9Qb8VJZ/eMNxAGb/xQEEnA89jQBzhJbY A1PBstXtrwwrgUWv2+VKFLNWQrTT0xTBg1xyff5Q+SY+QjMVQVmTBfAaHfeUA1DwG/W5 PmYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=1TRUIjFY0f/8rv7vnlDfvrnlRzzApzrPDwcr+VzHvIw=; b=PHz3/P1T6WKinECKQ5St/nWzzMLFyty4peYw2U/JBbGziD/RRkTHZErkCebY9vwVQA mc+9r6wODkxLXiYV92fWYsJbhUEiF5f7eEq+bNFBmPC4V9QcDE2lJhDjtwywGBvzJIDF QZE0IlJg8dsZVoEE/hZujPlqh2Ml2qWhMRwUnnyzdEZ/UEMaLQ8G/3LrJ4GYOAgKaQ88 ED5GO2XjwDcuOFl5JB/cB+ksBITE/7/VhArrMB96HKG4CGKTycG/BPkXXmE4L+pbhmfl ulo5bwGqwjcAhdSnK4n563/sszikjQmdWeipqofIjhClJKwvSMf3xJ+BIIWdkQzXxN+q PpFQ== X-Gm-Message-State: AHQUAubNHlSk237NbDhLFrPpe0Yl76sr2o5b8IODOV3CmYnZO8kSK1K6 icPHPHfzup+6eKw0rYiQm8RdMzdQ6jz2PKTmWlKD2PHYA5GX/LYiRhCH0m2cDC1Sf/VWNOzOPLc fN5c8aOoiL8jw3L5BdDFNUbNuhT5Nc+gEEHfa0w== X-Received: by 2002:a24:4a8f:: with SMTP id k137mr6713248itb.8.1551560954007; Sat, 02 Mar 2019 13:09:14 -0800 (PST) X-Google-Smtp-Source: APXvYqyBNHzgoIXs+qxio8KHl+meElblBuectpUnCFyhGlTymX1COyCoIdhv3TuLMe9yvXZ2BvefrQ== X-Received: by 2002:a24:4a8f:: with SMTP id k137mr6713236itb.8.1551560953780; Sat, 02 Mar 2019 13:09:13 -0800 (PST) Received: from cs-u-syssec1.dtc.umn.edu (cs-u-syssec1.cs.umn.edu. [128.101.106.66]) by smtp.gmail.com with ESMTPSA id 203sm932212itm.30.2019.03.02.13.09.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 02 Mar 2019 13:09:13 -0800 (PST) From: Aditya Pakki To: pakki001@umn.edu Cc: kjlu@umn.edu, Darren Hart , Andy Shevchenko , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , x86@kernel.org, Nicolai Stange , Kees Cook , Andrew Banman , Mike Travis , Colin Ian King , Varsha Rao , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] x86: uv: Fix potential NULL pointer dereference of kmalloc_node Date: Sat, 2 Mar 2019 15:09:04 -0600 Message-Id: <20190302210905.13032-1-pakki001@umn.edu> X-Mailer: git-send-email 2.17.1 Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP kmalloc_node might fail to allocate memory for thp field. This fix attempts to avoid a potential NULL pointer dereference. Signed-off-by: Aditya Pakki --- arch/x86/platform/uv/tlb_uv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c index a4130b84d1ff..5a6d51e30a36 100644 --- a/arch/x86/platform/uv/tlb_uv.c +++ b/arch/x86/platform/uv/tlb_uv.c @@ -2011,6 +2011,9 @@ static void make_per_cpu_thp(struct bau_control *smaster) size_t hpsz = sizeof(struct hub_and_pnode) * num_possible_cpus(); smaster->thp = kmalloc_node(hpsz, GFP_KERNEL, smaster->osnode); + if (!smaster->thp) + return; + memset(smaster->thp, 0, hpsz); for_each_present_cpu(cpu) { smaster->thp[cpu].pnode = uv_cpu_hub_info(cpu)->pnode;