From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CCA2DC004C9 for ; Tue, 7 May 2019 05:41:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 98EC5205ED for ; Tue, 7 May 2019 05:41:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557207691; bh=SJeomDPalkSm+jcQD3GvAMPaFuGrEe0TdvvfnAB3qkU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Khc3wzXz050/4ZdXT8INP5+7E9a33MChMr0P6m6ivXg65Sg/ANSx26teUi/g6sQg7 y9NGYsIXitqj5pKijxFFTkijMFdNXhz7LekyzvoKT/O1wM7G2krObBveObUVojCdDE xivFEpEHnwrJDhEwxzC/GUyW+ZcIjnm/r3khJp4U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728714AbfEGFla (ORCPT ); Tue, 7 May 2019 01:41:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:60934 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729327AbfEGFl1 (ORCPT ); Tue, 7 May 2019 01:41:27 -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 3E82420B7C; Tue, 7 May 2019 05:41:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557207686; bh=SJeomDPalkSm+jcQD3GvAMPaFuGrEe0TdvvfnAB3qkU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J+yDtiBlgD0mAPBX6D79dYusABWeDi7+1gDnXrouJdAdZ3MBjTZFjrxSyt82Sy4IO jzrkmiuFyyzulIUUj3RYSj1FBEtgooEFWf8kjHgaVsCAQYCxRng9HkAjUPuiuuJ4Ly iSHBzRBvGqRSZk2QlDQ2ywxuAOR0ffCg4dYLUAn8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kangjie Lu , Dan Williams , Sasha Levin , linux-nvdimm@lists.01.org Subject: [PATCH AUTOSEL 4.9 02/25] libnvdimm/namespace: Fix a potential NULL pointer dereference Date: Tue, 7 May 2019 01:40:59 -0400 Message-Id: <20190507054123.32514-2-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190507054123.32514-1-sashal@kernel.org> References: <20190507054123.32514-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: Kangjie Lu [ Upstream commit 55c1fc0af29a6c1b92f217b7eb7581a882e0c07c ] In case kmemdup fails, the fix goes to blk_err to avoid NULL pointer dereference. Signed-off-by: Kangjie Lu Signed-off-by: Dan Williams Signed-off-by: Sasha Levin --- drivers/nvdimm/namespace_devs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c index 9bc5f555ee68..cf4a90b50f8b 100644 --- a/drivers/nvdimm/namespace_devs.c +++ b/drivers/nvdimm/namespace_devs.c @@ -2028,9 +2028,12 @@ struct device *create_namespace_blk(struct nd_region *nd_region, if (!nsblk->uuid) goto blk_err; memcpy(name, nd_label->name, NSLABEL_NAME_LEN); - if (name[0]) + if (name[0]) { nsblk->alt_name = kmemdup(name, NSLABEL_NAME_LEN, GFP_KERNEL); + if (!nsblk->alt_name) + goto blk_err; + } res = nsblk_add_resource(nd_region, ndd, nsblk, __le64_to_cpu(nd_label->dpa)); if (!res) -- 2.20.1