Commit b85e3367 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: nft_set_pipapo: clamp maximum map bucket size to INT_MAX 



Otherwise, it is possible to hit WARN_ON_ONCE in __kvmalloc_node_noprof()
when resizing hashtable because __GFP_NOWARN is unset.

Similar to:

  b541ba7d ("netfilter: conntrack: clamp maximum hashtable size to INT_MAX")

Reviewed-by: default avatarStefano Brivio <sbrivio@redhat.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 4c5c6aa9

net/netfilter/nft_set_pipapo.c

+6 −0
Original line number Diff line number Diff line
@@ -663,6 +663,9 @@ static int pipapo_realloc_mt(struct nft_pipapo_field *f, 
	    check_add_overflow(rules, extra, &rules_alloc))

		return -EOVERFLOW;



	if (rules_alloc > (INT_MAX / sizeof(*new_mt)))

		return -ENOMEM;



	new_mt = kvmalloc_array(rules_alloc, sizeof(*new_mt), GFP_KERNEL_ACCOUNT);

	if (!new_mt)

		return -ENOMEM;
@@ -1499,6 +1502,9 @@ static struct nft_pipapo_match *pipapo_clone(struct nft_pipapo_match *old) 
		       src->groups * NFT_PIPAPO_BUCKETS(src->bb));



		if (src->rules > 0) {

			if (src->rules_alloc > (INT_MAX / sizeof(*src->mt)))

				goto out_mt;



			dst->mt = kvmalloc_array(src->rules_alloc,

						 sizeof(*src->mt),

						 GFP_KERNEL_ACCOUNT);