linux-kernel - [PATCH 5.1 310/405] x86/platform/uv: Fix missing checks of kcalloc() return values

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20190530030556.486305232@linuxfoundation.org>
Date:   Wed, 29 May 2019 20:05:08 -0700
From:   Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To:     linux-kernel@...r.kernel.org
Cc:     Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        stable@...r.kernel.org, Kangjie Lu <kjlu@....edu>,
        Borislav Petkov <bp@...e.de>, Andrew Banman <abanman@....com>,
        Andy Shevchenko <andy@...radead.org>,
        Colin Ian King <colin.king@...onical.com>,
        Darren Hart <dvhart@...radead.org>,
        "Gustavo A. R. Silva" <gustavo@...eddedor.com>,
        "H. Peter Anvin" <hpa@...or.com>, Ingo Molnar <mingo@...hat.com>,
        Kees Cook <keescook@...omium.org>,
        Mike Travis <mike.travis@....com>,
        Nicolai Stange <nstange@...e.de>, pakki001@....edu,
        platform-driver-x86@...r.kernel.org,
        Thomas Gleixner <tglx@...utronix.de>,
        Varsha Rao <rvarsha016@...il.com>, x86-ml <x86@...nel.org>,
        Sasha Levin <sashal@...nel.org>
Subject: [PATCH 5.1 310/405] x86/platform/uv: Fix missing checks of kcalloc() return values

[ Upstream commit 766460852cfaeca4042e5f3aeb9616b3689147bc ]

Handle potential errors returned from kcalloc().

 [ bp: rewrite commit message. ]

Signed-off-by: Kangjie Lu <kjlu@....edu>
Signed-off-by: Borislav Petkov <bp@...e.de>
Cc: Andrew Banman <abanman@....com>
Cc: Andy Shevchenko <andy@...radead.org>
Cc: Colin Ian King <colin.king@...onical.com>
Cc: Darren Hart <dvhart@...radead.org>
Cc: "Gustavo A. R. Silva" <gustavo@...eddedor.com>
Cc: "H. Peter Anvin" <hpa@...or.com>
Cc: Ingo Molnar <mingo@...hat.com>
Cc: Kees Cook <keescook@...omium.org>
Cc: Mike Travis <mike.travis@....com>
Cc: Nicolai Stange <nstange@...e.de>
Cc: pakki001@....edu
Cc: platform-driver-x86@...r.kernel.org
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Varsha Rao <rvarsha016@...il.com>
Cc: x86-ml <x86@...nel.org>
Link: https://lkml.kernel.org/r/20190325202924.4624-1-kjlu@umn.edu
Signed-off-by: Sasha Levin <sashal@...nel.org>
---
 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 2c53b0f19329a..1297e185b8c8d 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;
-- 
2.20.1