Skip to contentSkip to conversation

misc: enclosure: Use struct_size() in kzalloc()

PATCH New Gustavo A. R. Silva 1 participant 1 message Jan 8, 2019 Char and misc drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 misc: enclosure: 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 foo {
    int stuff;
    void *entry[];
};

instance = kzalloc(sizeof(struct foo) + sizeof(void *) * 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, entry, count), GFP_KERNEL);

This code was detected with the help of Coccinelle.

---
 drivers/misc/enclosure.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/misc/enclosure.c +1 -3
index 5a17bfeb80d3..74d4fda6c4a7 100644
@@ -125,9 +125,7 @@ enclosure_register(struct device *dev, const char *name, int components,
 		   struct enclosure_component_callbacks *cb)
 {
 	struct enclosure_device *edev =
-		kzalloc(sizeof(struct enclosure_device) +
-			sizeof(struct enclosure_component)*components,
-			GFP_KERNEL);
+		kzalloc(struct_size(edev, component, components), GFP_KERNEL);
 	int err, i;
 
 	BUG_ON(!cb);
Signature · 1 line
2.20.1