From: Dan Williams <dan.j.williams@intel.com>
To: Aditya Pakki <pakki001@umn.edu>
Cc: linux-nvdimm <linux-nvdimm@lists.01.org>,
Kangjie Lu <kjlu@umn.edu>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v3] nvdimm: btt_devs: fix a NULL pointer dereference
Date: Mon, 25 Mar 2019 14:42:58 -0700 [thread overview]
Message-ID: <CAPcyv4jEgTsG5eR0siz71qytcEa7crhm4TpfFzUASoJM3bupiA@mail.gmail.com> (raw)
In-Reply-To: <20190325213618.12139-1-pakki001@umn.edu>
On Mon, Mar 25, 2019 at 2:36 PM Aditya Pakki <pakki001@umn.edu> 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>
>
> ---
> 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 | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/nvdimm/btt_devs.c b/drivers/nvdimm/btt_devs.c
> index b72a303176c7..f73fb5fdc93f 100644
> --- a/drivers/nvdimm/btt_devs.c
> +++ b/drivers/nvdimm/btt_devs.c
> @@ -204,8 +204,11 @@ static struct device *__nd_btt_create(struct nd_region *nd_region,
> }
>
> 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 +223,11 @@ 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);
> + kfree(nd_btt);
There's still 2 calls to "kfree(nd_btt)" when only one is needed.
Please route them both to the same call.
_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm
prev parent reply other threads:[~2019-03-25 21:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-25 21:36 [PATCH v3] nvdimm: btt_devs: fix a NULL pointer dereference Aditya Pakki
2019-03-25 21:42 ` Dan Williams [this message]
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=CAPcyv4jEgTsG5eR0siz71qytcEa7crhm4TpfFzUASoJM3bupiA@mail.gmail.com \
--to=dan.j.williams@intel.com \
--cc=kjlu@umn.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvdimm@lists.01.org \
--cc=pakki001@umn.edu \
/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;
as well as URLs for NNTP newsgroup(s).