Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

regulator: da9062: Use struct_size() in devm_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 foo {
int stuff;
struct boo entry[];
};

size = sizeof(struct foo) + count * sizeof(struct boo);
instance = alloc(size, GFP_KERNEL)

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

instance = alloc(struct_size(instance, entry, count), GFP_KERNEL)

Notice that, in this case, variable size is not necessary, hence it is
removed.

This code was detected with the help of Coccinelle.

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Acked-by: Steve Twiss <stwiss.opensource@diasemi.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Gustavo A. R. Silva and committed by
Mark Brown
97b047e7 1ec9c179

+2 -4
+2 -4
drivers/regulator/da9062-regulator.c
··· 992 992 struct regulator_config config = { }; 993 993 const struct da9062_regulator_info *rinfo; 994 994 int irq, n, ret; 995 - size_t size; 996 995 int max_regulators; 997 996 998 997 switch (chip->chip_type) { ··· 1009 1010 } 1010 1011 1011 1012 /* Allocate memory required by usable regulators */ 1012 - size = sizeof(struct da9062_regulators) + 1013 - max_regulators * sizeof(struct da9062_regulator); 1014 - regulators = devm_kzalloc(&pdev->dev, size, GFP_KERNEL); 1013 + regulators = devm_kzalloc(&pdev->dev, struct_size(regulators, regulator, 1014 + max_regulators), GFP_KERNEL); 1015 1015 if (!regulators) 1016 1016 return -ENOMEM; 1017 1017