]> www.infradead.org Git - users/jedix/linux-maple.git/commit
netfilter: nft_set_pipapo: prevent overflow in lookup table allocation
authorPablo Neira Ayuso <pablo@netfilter.org>
Tue, 22 Apr 2025 19:52:43 +0000 (21:52 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 5 May 2025 11:17:32 +0000 (13:17 +0200)
commit4c5c6aa9967dbe55bd017bb509885928d0f31206
tree58e5f7317807a6051869987a9474d73a5f8571f2
parent5e4d107abd796fa433084ae656076952fb7f7d6d
netfilter: nft_set_pipapo: prevent overflow in lookup table allocation

When calculating the lookup table size, ensure the following
multiplication does not overflow:

- desc->field_len[] maximum value is U8_MAX multiplied by
  NFT_PIPAPO_GROUPS_PER_BYTE(f) that can be 2, worst case.
- NFT_PIPAPO_BUCKETS(f->bb) is 2^8, worst case.
- sizeof(unsigned long), from sizeof(*f->lt), lt in
  struct nft_pipapo_field.

Then, use check_mul_overflow() to multiply by bucket size and then use
check_add_overflow() to the alignment for avx2 (if needed). Finally, add
lt_size_check_overflow() helper and use it to consolidate this.

While at it, replace leftover allocation using the GFP_KERNEL to
GFP_KERNEL_ACCOUNT for consistency, in pipapo_resize().

Fixes: 3c4287f62044 ("nf_tables: Add set type for arbitrary concatenation of ranges")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/nft_set_pipapo.c