mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Mukesh Ojha <mojha@codeaurora.org>
To: Aditya Pakki <pakki001@umn.edu>
Cc: kjlu@umn.edu, Vishal Verma <vishal.l.verma@intel.com>,
	Dan Williams <dan.j.williams@intel.com>,
	Dave Jiang <dave.jiang@intel.com>,
	Keith Busch <keith.busch@intel.com>,
	Ira Weiny <ira.weiny@intel.com>,
	linux-nvdimm@lists.01.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v4] nvdimm: btt_devs: fix a NULL pointer dereference
Date: Tue, 26 Mar 2019 15:53:07 +0530	[thread overview]
Message-ID: <5fa84f18-7253-2543-57e4-6a9e2b2da716@codeaurora.org> (raw)
In-Reply-To: <20190325215527.12574-1-pakki001@umn.edu>


On 3/26/2019 3:25 AM, Aditya Pakki wrote:
> In case kmemdup fails, the fix releases resources and returns to
> avoid the NULL pointer dereference.
>
> Signed-off-by: Aditya Pakki <pakki001@umn.edu>
>
> ---
> v3: Move kfree(nd_btt) to goto block.
> v2: Replace incorrect kfree with ida_simple_remove, suggested by
> Johannes Thumshirn
> v1: Free nd_btt->id in case of failure and avoid double free, suggested
> by Dan Williams
> ---
>   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 b72a303176c7..9486acc08402 100644
> --- a/drivers/nvdimm/btt_devs.c
> +++ b/drivers/nvdimm/btt_devs.c
> @@ -198,14 +198,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);
> @@ -220,6 +221,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)


you have to take care of this below if block(true) as well as you are 
touching the function.
  if (ndns && !__nd_attach_ndns(&nd_btt->dev, ndns, &nd_btt->ndns)) {

Thanks,
Mukesh


  reply	other threads:[~2019-03-26 10:23 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-25 21:55 Aditya Pakki
2019-03-26 10:23 ` Mukesh Ojha [this message]
2019-03-26 18:31   ` Dan Williams

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=5fa84f18-7253-2543-57e4-6a9e2b2da716@codeaurora.org \
    --to=mojha@codeaurora.org \
    --cc=dan.j.williams@intel.com \
    --cc=dave.jiang@intel.com \
    --cc=ira.weiny@intel.com \
    --cc=keith.busch@intel.com \
    --cc=kjlu@umn.edu \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nvdimm@lists.01.org \
    --cc=pakki001@umn.edu \
    --cc=vishal.l.verma@intel.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®