diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2023-05-05 23:26:34 +0200 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2023-05-18 08:48:55 +0200 |
| commit | a2a0ffb0846895923991aa87e022dc228d53c125 (patch) | |
| tree | f4dfa592e39bdf1f73e117bf382c1cea3ce73a26 /net/netfilter/nft_set_pipapo.c | |
| parent | 61e03e912da8212c3de2529054502e8388dfd484 (diff) | |
| download | linux-a2a0ffb0846895923991aa87e022dc228d53c125.tar.gz | |
netfilter: nft_set_pipapo: Use struct_size()
Use struct_size() instead of hand writing it.
This is less verbose and more informative.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'net/netfilter/nft_set_pipapo.c')
| -rw-r--r-- | net/netfilter/nft_set_pipapo.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/netfilter/nft_set_pipapo.c b/net/netfilter/nft_set_pipapo.c index 06d46d18263473..34c684e121d34f 100644 --- a/net/netfilter/nft_set_pipapo.c +++ b/net/netfilter/nft_set_pipapo.c @@ -1274,8 +1274,7 @@ static struct nft_pipapo_match *pipapo_clone(struct nft_pipapo_match *old) struct nft_pipapo_match *new; int i; - new = kmalloc(sizeof(*new) + sizeof(*dst) * old->field_count, - GFP_KERNEL); + new = kmalloc(struct_size(new, f, old->field_count), GFP_KERNEL); if (!new) return ERR_PTR(-ENOMEM); @@ -2059,8 +2058,7 @@ static int nft_pipapo_init(const struct nft_set *set, if (field_count > NFT_PIPAPO_MAX_FIELDS) return -EINVAL; - m = kmalloc(sizeof(*priv->match) + sizeof(*f) * field_count, - GFP_KERNEL); + m = kmalloc(struct_size(m, f, field_count), GFP_KERNEL); if (!m) return -ENOMEM; |