Commit 2b90cb22 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Dan Williams
Browse files

libnvdimm, region: Use struct_size() in kzalloc()



One of the more common cases of allocation size calculations is finding
the size of a structure that has a zero-sized array at the end, along
with memory for some number of elements for that array. For example:

struct nd_region {
	...
        struct nd_mapping mapping[0];
};

instance = kzalloc(sizeof(struct nd_region) + sizeof(struct nd_mapping) *
                          count, GFP_KERNEL);

Instead of leaving these open-coded and prone to type mistakes, we can
now use the new struct_size() helper:

instance = kzalloc(struct_size(instance, mapping, count), GFP_KERNEL);

This code was detected with the help of Coccinelle.

Signed-off-by: default avatarGustavo A. R. Silva <gustavo@embeddedor.com>
Reviewed-by: default avatarVishal Verma <vishal.l.verma@intel.com>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20190610210613.GA21989@embeddedor


Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 5518ba4e
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -1025,9 +1025,8 @@ 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,
		nd_region = kzalloc(struct_size(nd_region, mapping,
						ndr_desc->num_mappings),
				    GFP_KERNEL);
		region_buf = nd_region;
	}