* [PATCH] nvdimm: btt_devs: fix a NULL pointer dereference and a memory leak
@ 2019-03-12 8:15 Kangjie Lu
2019-03-22 22:49 ` Verma, Vishal L
2019-03-22 22:55 ` Dan Williams
0 siblings, 2 replies; 5+ messages in thread
From: Kangjie Lu @ 2019-03-12 8:15 UTC (permalink / raw)
To: kjlu
Cc: pakki001, Dan Williams, Ross Zwisler, Vishal Verma, Dave Jiang,
linux-nvdimm, linux-kernel
In case kmemdup fails, the fix releases resources and returns to
avoid the NULL pointer dereference.
Also, the error paths in the following code should release
resources to avoid memory leaks.
Signed-off-by: Kangjie Lu <kjlu@umn.edu>
---
drivers/nvdimm/btt_devs.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/nvdimm/btt_devs.c b/drivers/nvdimm/btt_devs.c
index 795ad4ff35ca..565ea0b6f765 100644
--- a/drivers/nvdimm/btt_devs.c
+++ b/drivers/nvdimm/btt_devs.c
@@ -196,8 +196,13 @@ 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) {
+ kfree(nd_btt);
+ return NULL;
+ }
+ }
nd_btt->uuid = uuid;
dev = &nd_btt->dev;
dev_set_name(dev, "btt%d.%d", nd_region->id, nd_btt->id);
@@ -209,6 +214,7 @@ static struct device *__nd_btt_create(struct nd_region *nd_region,
dev_dbg(&ndns->dev, "failed, already claimed by %s\n",
dev_name(ndns->claim));
put_device(dev);
+ kfree(uuid);
return NULL;
}
return dev;
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] nvdimm: btt_devs: fix a NULL pointer dereference and a memory leak
2019-03-12 8:15 [PATCH] nvdimm: btt_devs: fix a NULL pointer dereference and a memory leak Kangjie Lu
@ 2019-03-22 22:49 ` Verma, Vishal L
2019-03-22 22:56 ` Verma, Vishal L
2019-03-22 22:55 ` Dan Williams
1 sibling, 1 reply; 5+ messages in thread
From: Verma, Vishal L @ 2019-03-22 22:49 UTC (permalink / raw)
To: kjlu
Cc: Williams, Dan J, linux-kernel, Jiang, Dave, pakki001,
linux-nvdimm, zwisler
On Tue, 2019-03-12 at 03:15 -0500, Kangjie Lu wrote:
> In case kmemdup fails, the fix releases resources and returns to
> avoid the NULL pointer dereference.
> Also, the error paths in the following code should release
> resources to avoid memory leaks.
>
> Signed-off-by: Kangjie Lu <kjlu@umn.edu>
> ---
> drivers/nvdimm/btt_devs.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
Looks good,
Reviewed-by: Vishal Verma <vishal.l.verma@intel.com>
> diff --git a/drivers/nvdimm/btt_devs.c b/drivers/nvdimm/btt_devs.c
> index 795ad4ff35ca..565ea0b6f765 100644
> --- a/drivers/nvdimm/btt_devs.c
> +++ b/drivers/nvdimm/btt_devs.c
> @@ -196,8 +196,13 @@ 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) {
> + kfree(nd_btt);
> + return NULL;
> + }
> + }
> nd_btt->uuid = uuid;
> dev = &nd_btt->dev;
> dev_set_name(dev, "btt%d.%d", nd_region->id, nd_btt->id);
> @@ -209,6 +214,7 @@ static struct device *__nd_btt_create(struct
> nd_region *nd_region,
> dev_dbg(&ndns->dev, "failed, already claimed by %s\n",
> dev_name(ndns->claim));
> put_device(dev);
> + kfree(uuid);
> return NULL;
> }
> return dev;
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] nvdimm: btt_devs: fix a NULL pointer dereference and a memory leak
2019-03-22 22:49 ` Verma, Vishal L
@ 2019-03-22 22:56 ` Verma, Vishal L
2019-03-22 23:31 ` Verma, Vishal L
0 siblings, 1 reply; 5+ messages in thread
From: Verma, Vishal L @ 2019-03-22 22:56 UTC (permalink / raw)
To: kjlu; +Cc: linux-kernel, linux-nvdimm, pakki001, zwisler
On Fri, 2019-03-22 at 22:49 +0000, Verma, Vishal L wrote:
> On Tue, 2019-03-12 at 03:15 -0500, Kangjie Lu wrote:
> > In case kmemdup fails, the fix releases resources and returns to
> > avoid the NULL pointer dereference.
> > Also, the error paths in the following code should release
> > resources to avoid memory leaks.
> >
> > Signed-off-by: Kangjie Lu <kjlu@umn.edu>
> > ---
> > drivers/nvdimm/btt_devs.c | 8 +++++++-
> > 1 file changed, 7 insertions(+), 1 deletion(-)
> >
>
> Looks good,
> Reviewed-by: Vishal Verma <vishal.l.verma@intel.com>
Looking again, there is another kmemdup() call in __nd_btt_probe which
is lacking error checking.
And referring to your other related patch to namespace_devs, that has
/several/ instances of the same thing.
Instead of fixing just a couple of these, it might be worthwhile to send
a wider cleanup patch to catch all of these, at least within
drivers/nvdimm/ for starters, instead of a select few.
>
> > diff --git a/drivers/nvdimm/btt_devs.c b/drivers/nvdimm/btt_devs.c
> > index 795ad4ff35ca..565ea0b6f765 100644
> > --- a/drivers/nvdimm/btt_devs.c
> > +++ b/drivers/nvdimm/btt_devs.c
> > @@ -196,8 +196,13 @@ 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) {
> > + kfree(nd_btt);
> > + return NULL;
> > + }
> > + }
> > nd_btt->uuid = uuid;
> > dev = &nd_btt->dev;
> > dev_set_name(dev, "btt%d.%d", nd_region->id, nd_btt->id);
> > @@ -209,6 +214,7 @@ static struct device *__nd_btt_create(struct
> > nd_region *nd_region,
> > dev_dbg(&ndns->dev, "failed, already claimed by %s\n",
> > dev_name(ndns->claim));
> > put_device(dev);
> > + kfree(uuid);
> > return NULL;
> > }
> > return dev;
>
> _______________________________________________
> Linux-nvdimm mailing list
> Linux-nvdimm@lists.01.org
> https://lists.01.org/mailman/listinfo/linux-nvdimm
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] nvdimm: btt_devs: fix a NULL pointer dereference and a memory leak
2019-03-22 22:56 ` Verma, Vishal L
@ 2019-03-22 23:31 ` Verma, Vishal L
0 siblings, 0 replies; 5+ messages in thread
From: Verma, Vishal L @ 2019-03-22 23:31 UTC (permalink / raw)
To: kjlu; +Cc: linux-kernel, linux-nvdimm, pakki001, zwisler
On Fri, 2019-03-22 at 22:56 +0000, Verma, Vishal L wrote:
> On Fri, 2019-03-22 at 22:49 +0000, Verma, Vishal L wrote:
> > On Tue, 2019-03-12 at 03:15 -0500, Kangjie Lu wrote:
> > > In case kmemdup fails, the fix releases resources and returns to
> > > avoid the NULL pointer dereference.
> > > Also, the error paths in the following code should release
> > > resources to avoid memory leaks.
> > >
> > > Signed-off-by: Kangjie Lu <kjlu@umn.edu>
> > > ---
> > > drivers/nvdimm/btt_devs.c | 8 +++++++-
> > > 1 file changed, 7 insertions(+), 1 deletion(-)
> > >
> >
> > Looks good,
> > Reviewed-by: Vishal Verma <vishal.l.verma@intel.com>
>
> Looking again, there is another kmemdup() call in __nd_btt_probe which
> is lacking error checking.
> And referring to your other related patch to namespace_devs, that has
> /several/ instances of the same thing.
>
> Instead of fixing just a couple of these, it might be worthwhile to send
> a wider cleanup patch to catch all of these, at least within
> drivers/nvdimm/ for starters, instead of a select few.
Hm, ignore this comment - these are the only two unchecked instances.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] nvdimm: btt_devs: fix a NULL pointer dereference and a memory leak
2019-03-12 8:15 [PATCH] nvdimm: btt_devs: fix a NULL pointer dereference and a memory leak Kangjie Lu
2019-03-22 22:49 ` Verma, Vishal L
@ 2019-03-22 22:55 ` Dan Williams
1 sibling, 0 replies; 5+ messages in thread
From: Dan Williams @ 2019-03-22 22:55 UTC (permalink / raw)
To: Kangjie Lu
Cc: pakki001, Ross Zwisler, Vishal Verma, Dave Jiang, linux-nvdimm,
Linux Kernel Mailing List
On Tue, Mar 12, 2019 at 1:16 AM Kangjie Lu <kjlu@umn.edu> wrote:
>
> In case kmemdup fails, the fix releases resources and returns to
> avoid the NULL pointer dereference.
> Also, the error paths in the following code should release
> resources to avoid memory leaks.
>
> Signed-off-by: Kangjie Lu <kjlu@umn.edu>
> ---
> drivers/nvdimm/btt_devs.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/nvdimm/btt_devs.c b/drivers/nvdimm/btt_devs.c
> index 795ad4ff35ca..565ea0b6f765 100644
> --- a/drivers/nvdimm/btt_devs.c
> +++ b/drivers/nvdimm/btt_devs.c
> @@ -196,8 +196,13 @@ 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) {
> + kfree(nd_btt);
> + return NULL;
What about nd_btt->id? That needs to be released as well.
> + }
> + }
> nd_btt->uuid = uuid;
> dev = &nd_btt->dev;
> dev_set_name(dev, "btt%d.%d", nd_region->id, nd_btt->id);
> @@ -209,6 +214,7 @@ static struct device *__nd_btt_create(struct nd_region *nd_region,
> dev_dbg(&ndns->dev, "failed, already claimed by %s\n",
> dev_name(ndns->claim));
> put_device(dev);
> + kfree(uuid);
This will be a double free because put_device() will arrange for
nd_btt_release() to be called which does kfree(nd_btt->uuid);
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-03-22 23:31 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-12 8:15 [PATCH] nvdimm: btt_devs: fix a NULL pointer dereference and a memory leak Kangjie Lu
2019-03-22 22:49 ` Verma, Vishal L
2019-03-22 22:56 ` Verma, Vishal L
2019-03-22 23:31 ` Verma, Vishal L
2019-03-22 22:55 ` Dan Williams
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).