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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,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 8F12DC04E53 for ; Wed, 15 May 2019 11:10:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 51E3020644 for ; Wed, 15 May 2019 11:10:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557918644; bh=WYoBEswerXNTnP2S/vTNkUb8bnH38ITS1vRKsRkJNH4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BE5q0Lx24uToJrzB/Xsprn2O1wvyzO/q9+Xyr0++AcZrJvs+5LAk7rzgWH54VwTXJ qWrRmEA1wtxuNz+il44TKbef1bhuoVn3N+MR2JN/w5cl9ylWuFeVVCFVy72cVhNnae f9Kfj3EodhX+i6kBZ7f0UfM+psR04k98TGqzJkaY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729451AbfEOLKn (ORCPT ); Wed, 15 May 2019 07:10:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:44640 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729435AbfEOLKi (ORCPT ); Wed, 15 May 2019 07:10:38 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 07BE42166E; Wed, 15 May 2019 11:10:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557918637; bh=WYoBEswerXNTnP2S/vTNkUb8bnH38ITS1vRKsRkJNH4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CNPwZ0VUOLZcQZzLUOI6J+/srH5Vp1Vdro0IOu221Yob3yJ0LB/bCVYNJLcUIxjoy 26eW0Jh6CzpSSx+lyxP+DXL1cDB/5VtHgw9NTHJxy5dTRdCaIUM8QodJ4uKX31ibpq bbi5yO7ebSQEsnYH+ObyDWGzTbWgLKTtx2Eh5sPQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Aditya Pakki , Dan Williams , Sasha Levin Subject: [PATCH 4.4 165/266] libnvdimm/btt: Fix a kmemdup failure check Date: Wed, 15 May 2019 12:54:32 +0200 Message-Id: <20190515090728.501383765@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090722.696531131@linuxfoundation.org> References: <20190515090722.696531131@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 486fa92df4707b5df58d6508728bdb9321a59766 ] In case kmemdup fails, the fix releases resources and returns to avoid the NULL pointer dereference. Signed-off-by: Aditya Pakki Signed-off-by: Dan Williams Signed-off-by: Sasha Levin --- drivers/nvdimm/btt_devs.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/nvdimm/btt_devs.c b/drivers/nvdimm/btt_devs.c index cb477518dd0e4..4c129450495da 100644 --- a/drivers/nvdimm/btt_devs.c +++ b/drivers/nvdimm/btt_devs.c @@ -170,14 +170,15 @@ static struct device *__nd_btt_create(struct nd_region *nd_region, return NULL; nd_btt->id = ida_simple_get(&nd_region->btt_ida, 0, 0, GFP_KERNEL); - if (nd_btt->id < 0) { - kfree(nd_btt); - return NULL; - } + if (nd_btt->id < 0) + goto out_nd_btt; nd_btt->lbasize = lbasize; - if (uuid) + if (uuid) { uuid = kmemdup(uuid, 16, GFP_KERNEL); + if (!uuid) + goto out_put_id; + } nd_btt->uuid = uuid; dev = &nd_btt->dev; dev_set_name(dev, "btt%d.%d", nd_region->id, nd_btt->id); @@ -192,6 +193,13 @@ static struct device *__nd_btt_create(struct nd_region *nd_region, return NULL; } return dev; + +out_put_id: + ida_simple_remove(&nd_region->btt_ida, nd_btt->id); + +out_nd_btt: + kfree(nd_btt); + return NULL; } struct device *nd_btt_create(struct nd_region *nd_region) -- 2.20.1