Skip to content

Commit

Permalink
mlxsw: spectrum_acl_bloom_filter: use struct_size() in kzalloc()
Browse files Browse the repository at this point in the history
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.

Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Gustavo A. R. Silva authored and David S. Miller committed Jan 16, 2019
1 parent 590ce40 commit 2285ec8
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,8 @@ mlxsw_sp_acl_bf_init(struct mlxsw_sp *mlxsw_sp, unsigned int num_erp_banks)
* is 2^ACL_MAX_BF_LOG
*/
bf_bank_size = 1 << MLXSW_CORE_RES_GET(mlxsw_sp->core, ACL_MAX_BF_LOG);
bf = kzalloc(sizeof(*bf) + bf_bank_size * num_erp_banks *
sizeof(*bf->refcnt), GFP_KERNEL);
bf = kzalloc(struct_size(bf, refcnt, bf_bank_size * num_erp_banks),
GFP_KERNEL);
if (!bf)
return ERR_PTR(-ENOMEM);

Expand Down

0 comments on commit 2285ec8

Please sign in to comment.