evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libnvdimm/btt: Fix a kmemdup failure check

Browse source 
[ Upstream commit 486fa92df4707b5df58d6508728bdb9321a59766 ]

In case kmemdup fails, the fix releases resources and returns to
avoid the NULL pointer dereference.

Signed-off-by: Aditya Pakki <pakki001@umn.edu>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Aditya Pakki 2019-03-25 16:55:27 -05:00 • committed by Greg Kroah-Hartman
parent 3007ae4bbf
commit 905b8964c9
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/nvdimm/btt_devs.c
View file

@ -170,14 +170,15 @@ static struct device *__nd_btt_create(struct nd_region *nd_region,
return NULL; return NULL;
nd_btt->id = ida_simple_get(&nd_region->btt_ida, 0, 0, GFP_KERNEL); nd_btt->id = ida_simple_get(&nd_region->btt_ida, 0, 0, GFP_KERNEL);
if (nd_btt->id < 0) { if (nd_btt->id < 0)
kfree(nd_btt); goto out_nd_btt;
return NULL;
}
nd_btt->lbasize = lbasize; nd_btt->lbasize = lbasize;
if (uuid) if (uuid) {
uuid = kmemdup(uuid, 16, GFP_KERNEL); uuid = kmemdup(uuid, 16, GFP_KERNEL);
if (!uuid)
goto out_put_id;
}
nd_btt->uuid = uuid; nd_btt->uuid = uuid;
dev = &nd_btt->dev; dev = &nd_btt->dev;
dev_set_name(dev, "btt%d.%d", nd_region->id, nd_btt->id); 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 NULL;
} }
return dev; 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) struct device *nd_btt_create(struct nd_region *nd_region)