From: Colin Ian King
If devs cannot be allocated then the error exit path jumps to
a cleanup loop that iterates over a null array of devs which
is incorrect. Fix this by jumping instead to the end of the
function where NULL is returned.
Signed-off-by: Colin Ian King
---
drivers/nvdimm/namespace_devs.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c
index 3509cff..5d2755a 100644
--- a/drivers/nvdimm/namespace_devs.c
+++ b/drivers/nvdimm/namespace_devs.c
@@ -2125,7 +2125,7 @@ static struct device **scan_labels(struct nd_region
*nd_region)
devs = kcalloc(2, sizeof(dev), GFP_KERNEL);
if (!devs)
- goto err;
+ goto err_ret;
if (is_nd_blk(&nd_region->dev)) {
struct nd_namespace_blk *nsblk;
@@ -2182,6 +2182,7 @@ static struct device **scan_labels(struct nd_region
*nd_region)
else
namespace_pmem_release(devs[i]);
kfree(devs);
+ err_ret:
return NULL;
}
--
2.9.3
___
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm