aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKangjie Lu <[email protected]>2019-03-25 15:29:22 -0500
committerBorislav Petkov <[email protected]>2019-03-26 17:01:30 +0100
commit766460852cfaeca4042e5f3aeb9616b3689147bc (patch)
tree425e0c651acac651569a234414986c9ce93f4cd6
parent8c2ffd9174779014c3fe1f96d9dc3641d9175f00 (diff)
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 <[email protected]> Signed-off-by: Borislav Petkov <[email protected]> Cc: Andrew Banman <[email protected]> Cc: Andy Shevchenko <[email protected]> Cc: Colin Ian King <[email protected]> Cc: Darren Hart <[email protected]> Cc: "Gustavo A. R. Silva" <[email protected]> Cc: "H. Peter Anvin" <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Kees Cook <[email protected]> Cc: Mike Travis <[email protected]> Cc: Nicolai Stange <[email protected]> Cc: [email protected] Cc: [email protected] Cc: Thomas Gleixner <[email protected]> Cc: Varsha Rao <[email protected]> Cc: x86-ml <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
-rw-r--r--arch/x86/platform/uv/tlb_uv.c7
1 files changed, 6 insertions, 1 deletions
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;