Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06ae8dc0 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Kalle Valo
Browse files

ath10k: 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 issue was detected with the help of Coccinelle.

Signed-off-by: default avatarGustavo A. R. Silva <gustavo@embeddedor.com>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent a9911937

drivers/net/wireless/ath/ath10k/ce.c

+8 −16
Original line number Diff line number Diff line
@@ -1416,10 +1416,8 @@ ath10k_ce_alloc_src_ring(struct ath10k *ar, unsigned int ce_id, 


	nentries = roundup_pow_of_two(nentries);



	src_ring = kzalloc(sizeof(*src_ring) +

			   (nentries *

			    sizeof(*src_ring->per_transfer_context)),

			   GFP_KERNEL);

	src_ring = kzalloc(struct_size(src_ring, per_transfer_context,

				       nentries), GFP_KERNEL);

	if (src_ring == NULL)

		return ERR_PTR(-ENOMEM);
@@ -1476,10 +1474,8 @@ ath10k_ce_alloc_src_ring_64(struct ath10k *ar, unsigned int ce_id, 


	nentries = roundup_pow_of_two(nentries);



	src_ring = kzalloc(sizeof(*src_ring) +

			   (nentries *

			    sizeof(*src_ring->per_transfer_context)),

			   GFP_KERNEL);

	src_ring = kzalloc(struct_size(src_ring, per_transfer_context,

				       nentries), GFP_KERNEL);

	if (!src_ring)

		return ERR_PTR(-ENOMEM);
@@ -1534,10 +1530,8 @@ ath10k_ce_alloc_dest_ring(struct ath10k *ar, unsigned int ce_id, 


	nentries = roundup_pow_of_two(attr->dest_nentries);



	dest_ring = kzalloc(sizeof(*dest_ring) +

			    (nentries *

			     sizeof(*dest_ring->per_transfer_context)),

			    GFP_KERNEL);

	dest_ring = kzalloc(struct_size(dest_ring, per_transfer_context,

					nentries), GFP_KERNEL);

	if (dest_ring == NULL)

		return ERR_PTR(-ENOMEM);
@@ -1580,10 +1574,8 @@ ath10k_ce_alloc_dest_ring_64(struct ath10k *ar, unsigned int ce_id, 


	nentries = roundup_pow_of_two(attr->dest_nentries);



	dest_ring = kzalloc(sizeof(*dest_ring) +

			    (nentries *

			     sizeof(*dest_ring->per_transfer_context)),

			    GFP_KERNEL);

	dest_ring = kzalloc(struct_size(dest_ring, per_transfer_context,

					nentries), GFP_KERNEL);

	if (!dest_ring)

		return ERR_PTR(-ENOMEM);