Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp3255927ybj; Mon, 23 Sep 2019 18:01:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqwczSysQDs91ol8PIFnSBj7ES/H8LL51qCdXa1EDH7V9opx0GrMktABEZaQmgrtLgfoQAT4 X-Received: by 2002:a50:ac03:: with SMTP id v3mr27818edc.113.1569286908026; Mon, 23 Sep 2019 18:01:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569286908; cv=none; d=google.com; s=arc-20160816; b=lb8vhvsAATe9RK/g6TTy0B0msAhycHtXSaP3NogCMuwUvUXahQ62bVZo7rwscOOAcN GEz4l0pqKI1jjhSIgZuwMq83Z5fdhV4nz5yd8E1bq4CoysiCb2FBOcqSghjOEGh05Nmf uVIHzAc6GPhNdjdOz7EHVaDe2m6HbTNX1OzPx2uRqmsHLwNTmcQO3iESf5NnR77r27UD qwCEMmlI9Fqu5HYfPZXwhoMcrhAguQTbPpBCTmnoB6w2w2IdhRtREfh6bjEdSFMCR4JW /oax7qch4d4KsfVF4KHf0Ui3mT1Bl0c+T5o+6XfVmVhPzbdbcujWrNh9FN3gdHI7tjj9 eppA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=BV/OalkwnLKSIAtzOJKEaHJUYMOVNbvNjgRywhF2fyk=; b=NRw6iB16s3BxCU7HDKGaKMRmjDFv3ROqme19ZqI7O1kXnISCbl2Z6CIvkXMmG8OpXS qeRJ68DsZBGGFGwA/+xFnPmvfNBy4WF3IBuLFzxXBfTrraOfEM27PPv+Fw8ki5JjUqMv j9z/4KBgiCwo0nucjtwWGf1MeFp4Uj+zupgant5T7zAP9wAXF9IUQIhDmUfZCI62L49l JX9tehUVIDb8chXpynHXjfZwhk8K+CFQhJx7XnFIYtAXDmfU5XwIktC6GdBR8bQbSRIX BbrsKsVY6Stjdk6KfE/K5k1/xfNjusrtuCCbnoSsXb6fqsL1B1oEWPvAlrp6Lq08i5Eh sX3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hswl4ffU; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d23si135263edb.55.2019.09.23.18.01.08; Mon, 23 Sep 2019 18:01:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hswl4ffU; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391826AbfIVSsw (ORCPT + 99 others); Sun, 22 Sep 2019 14:48:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:45432 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391636AbfIVSsc (ORCPT ); Sun, 22 Sep 2019 14:48:32 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F12472186A; Sun, 22 Sep 2019 18:48:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178111; bh=g5a/68iI0jH7MH6VUDFnoDKfOl4b8iGjPCJESSuASV0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hswl4ffUD8/elkVmX+YJ8o9xL8U/PPTBP55mQJo8GvhGLKO5aNw4Hm53tmSiHCB6z xqgQIpPKqeVToDjjmjZxcprQORzvUPgKM/26eKephoznbGWmIIudqhBIi4o2U6IQFo FsB2RuEYQrbuKq18Yxeqy8qjNSZpCh/YyP0olulc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Austin Kim , Dimitri Sivanich , Hedi Berriche , Linus Torvalds , Mike Travis , Peter Zijlstra , Russ Anderson , Steve Wahl , Thomas Gleixner , allison@lohutok.net, andy@infradead.org, armijn@tjaldur.nl, bp@alien8.de, dvhart@infradead.org, gregkh@linuxfoundation.org, hpa@zytor.com, kjlu@umn.edu, platform-driver-x86@vger.kernel.org, Ingo Molnar , Sasha Levin Subject: [PATCH AUTOSEL 5.3 169/203] x86/platform/uv: Fix kmalloc() NULL check routine Date: Sun, 22 Sep 2019 14:43:15 -0400 Message-Id: <20190922184350.30563-169-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Austin Kim [ Upstream commit 864b23f0169d5bff677e8443a7a90dfd6b090afc ] The result of kmalloc() should have been checked ahead of below statement: pqp = (struct bau_pq_entry *)vp; Move BUG_ON(!vp) before above statement. Signed-off-by: Austin Kim Cc: Dimitri Sivanich Cc: Hedi Berriche Cc: Linus Torvalds Cc: Mike Travis Cc: Peter Zijlstra Cc: Russ Anderson Cc: Steve Wahl Cc: Thomas Gleixner Cc: allison@lohutok.net Cc: andy@infradead.org Cc: armijn@tjaldur.nl Cc: bp@alien8.de Cc: dvhart@infradead.org Cc: gregkh@linuxfoundation.org Cc: hpa@zytor.com Cc: kjlu@umn.edu Cc: platform-driver-x86@vger.kernel.org Link: https://lkml.kernel.org/r/20190905232951.GA28779@LGEARND20B15 Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- arch/x86/platform/uv/tlb_uv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c index 20c389a91b803..5f0a96bf27a1f 100644 --- a/arch/x86/platform/uv/tlb_uv.c +++ b/arch/x86/platform/uv/tlb_uv.c @@ -1804,9 +1804,9 @@ static void pq_init(int node, int pnode) plsize = (DEST_Q_SIZE + 1) * sizeof(struct bau_pq_entry); vp = kmalloc_node(plsize, GFP_KERNEL, node); - pqp = (struct bau_pq_entry *)vp; - BUG_ON(!pqp); + BUG_ON(!vp); + pqp = (struct bau_pq_entry *)vp; cp = (char *)pqp + 31; pqp = (struct bau_pq_entry *)(((unsigned long)cp >> 5) << 5); -- 2.20.1