diff options
| author | Florian Westphal <fw@strlen.de> | 2024-02-13 16:23:38 +0100 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2024-02-21 11:57:11 +0100 |
| commit | 07ace0bbe03b3d8e85869af1dec5e4087b1d57b8 (patch) | |
| tree | e3daeef43b443a27e206bf3ba6bc0418edb33ffc /net/netfilter | |
| parent | f04df573faf90bb828a2241b650598c02c074323 (diff) | |
| download | linux-07ace0bbe03b3d8e85869af1dec5e4087b1d57b8.tar.gz linux-07ace0bbe03b3d8e85869af1dec5e4087b1d57b8.tar.bz2 linux-07ace0bbe03b3d8e85869af1dec5e4087b1d57b8.zip | |
netfilter: nft_set_pipapo: do not rely on ZERO_SIZE_PTR
pipapo relies on kmalloc(0) returning ZERO_SIZE_PTR (i.e., not NULL
but pointer is invalid).
Rework this to not call slab allocator when we'd request a 0-byte
allocation.
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/nft_set_pipapo.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/net/netfilter/nft_set_pipapo.c b/net/netfilter/nft_set_pipapo.c index dedb17a4e07c..625c06b8bc39 100644 --- a/net/netfilter/nft_set_pipapo.c +++ b/net/netfilter/nft_set_pipapo.c @@ -525,6 +525,8 @@ static struct nft_pipapo_elem *pipapo_get(const struct net *net, int i; m = priv->clone; + if (m->bsize_max == 0) + return ret; res_map = kmalloc_array(m->bsize_max, sizeof(*res_map), GFP_ATOMIC); if (!res_map) { @@ -1367,11 +1369,17 @@ static struct nft_pipapo_match *pipapo_clone(struct nft_pipapo_match *old) src->bsize * sizeof(*dst->lt) * src->groups * NFT_PIPAPO_BUCKETS(src->bb)); - dst->mt = kvmalloc(src->rules * sizeof(*src->mt), GFP_KERNEL); - if (!dst->mt) - goto out_mt; + if (src->rules > 0) { + dst->mt = kvmalloc_array(src->rules, sizeof(*src->mt), + GFP_KERNEL); + if (!dst->mt) + goto out_mt; + + memcpy(dst->mt, src->mt, src->rules * sizeof(*src->mt)); + } else { + dst->mt = NULL; + } - memcpy(dst->mt, src->mt, src->rules * sizeof(*src->mt)); src++; dst++; } |