mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 14:19:16 +00:00
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>
This commit is contained in:
parent
61e03e912d
commit
a2a0ffb084
1 changed files with 2 additions and 4 deletions
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue