libnvdimm, region: Use struct_size() in kzalloc()
authorGustavo A. R. Silva <gustavo@embeddedor.com>
Mon, 10 Jun 2019 21:06:13 +0000 (16:06 -0500)
committerDan Williams <dan.j.williams@intel.com>
Thu, 29 Aug 2019 20:49:00 +0000 (13:49 -0700)
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: Gustavo A. R. Silva <gustavo@embeddedor.com>
Reviewed-by: Vishal Verma <vishal.l.verma@intel.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20190610210613.GA21989@embeddedor
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
drivers/nvdimm/region_devs.c

index af30cbe..b477a8d 100644 (file)
@@ -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;
        }