author: Gustavo A. R. Silva <gustavo@embeddedor.com> 2019-06-10 16:06:13 -0500
committer: Dan Williams <dan.j.williams@intel.com> 2019-08-29 13:49:00 -0700
commit: 2b90cb223320a93b1be6c2616efe6f9ff14d8b28
parent: 5518ba4ebd7d1e15fc558af05fa600198535f074
Commit Summary:
Diffstat:
1 file changed, 3 insertions, 4 deletions
diff --git a/drivers/nvdimm/region_devs.c b/drivers/nvdimm/region_devs.c
index af30cbe7a8ea..b477a8dc0020 100644
--- a/drivers/nvdimm/region_devs.c
+++ b/drivers/nvdimm/region_devs.c
@@ -1025,10 +1025,9 @@ static struct nd_region *nd_region_create(struct nvdimm_bus *nvdimm_bus,
}
region_buf = ndbr;
} else {
- nd_region = kzalloc(sizeof(struct nd_region)
- + sizeof(struct nd_mapping)
- * ndr_desc->num_mappings,
- GFP_KERNEL);
+ nd_region = kzalloc(struct_size(nd_region, mapping,
+ ndr_desc->num_mappings),
+ GFP_KERNEL);
region_buf = nd_region;
}