Skip to content

Commit c2b8bd4

Browse files
GustavoARSilvadhowells
authored andcommitted
afs: 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. Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> Signed-off-by: David Howells <dhowells@redhat.com>
1 parent a88cc8d commit c2b8bd4

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

fs/afs/server_list.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ struct afs_server_list *afs_alloc_server_list(struct afs_cell *cell,
4242
if (vldb->fs_mask[i] & type_mask)
4343
nr_servers++;
4444

45-
slist = kzalloc(sizeof(struct afs_server_list) +
46-
sizeof(struct afs_server_entry) * nr_servers,
47-
GFP_KERNEL);
45+
slist = kzalloc(struct_size(slist, servers, nr_servers), GFP_KERNEL);
4846
if (!slist)
4947
goto error;
5048

0 commit comments

Comments
 (0)