All of lore.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Kangjie Lu <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
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
Subject: [tip:x86/cleanups] x86/platform/uv: Fix missing checks of kcalloc() return values
Date: Tue, 26 Mar 2019 09:10:05 -0700	[thread overview]
Message-ID: <tip-766460852cfaeca4042e5f3aeb9616b3689147bc@git.kernel.org> (raw)
In-Reply-To: <20190325202924.4624-1-kjlu@umn.edu>

Commit-ID:  766460852cfaeca4042e5f3aeb9616b3689147bc
Gitweb:     https://git.kernel.org/tip/766460852cfaeca4042e5f3aeb9616b3689147bc
Author:     Kangjie Lu <kjlu@umn.edu>
AuthorDate: Mon, 25 Mar 2019 15:29:22 -0500
Committer:  Borislav Petkov <bp@suse.de>
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 <kjlu@umn.edu>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andrew Banman <abanman@hpe.com>
Cc: Andy Shevchenko <andy@infradead.org>
Cc: Colin Ian King <colin.king@canonical.com>
Cc: Darren Hart <dvhart@infradead.org>
Cc: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Mike Travis <mike.travis@hpe.com>
Cc: Nicolai Stange <nstange@suse.de>
Cc: pakki001@umn.edu
Cc: platform-driver-x86@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Varsha Rao <rvarsha016@gmail.com>
Cc: x86-ml <x86@kernel.org>
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;

  reply	other threads:[~2019-03-26 16:11 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-24 22:57 [PATCH] platform: uv: fix missing checks for kcalloc Kangjie Lu
2019-03-25 12:55 ` Borislav Petkov
2019-03-25 20:29   ` [PATCH v2] " Kangjie Lu
2019-03-26 16:10     ` tip-bot for Kangjie Lu [this message]
2019-04-23 20:02     ` Kees Cook

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-766460852cfaeca4042e5f3aeb9616b3689147bc@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=abanman@hpe.com \
    --cc=andy@infradead.org \
    --cc=bp@suse.de \
    --cc=colin.king@canonical.com \
    --cc=dvhart@infradead.org \
    --cc=gustavo@embeddedor.com \
    --cc=hpa@zytor.com \
    --cc=keescook@chromium.org \
    --cc=kjlu@umn.edu \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mike.travis@hpe.com \
    --cc=mingo@kernel.org \
    --cc=mingo@redhat.com \
    --cc=nstange@suse.de \
    --cc=rvarsha016@gmail.com \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.