author: Eric Dumazet <edumazet@google.com> 2021-05-06 05:53:23 -0700
committer: Pablo Neira Ayuso <pablo@netfilter.org> 2021-05-07 10:01:29 +0200
commit: a54754ec9891830ba548e2010c889e3c8146e449
parent: 85dfd816fabfc16e71786eda0a33a7046688b5b0
Commit Summary:
Diffstat:
1 file changed, 7 insertions, 1 deletion
diff --git a/net/netfilter/nft_set_hash.c b/net/netfilter/nft_set_hash.c
index 58f576abcd4a..328f2ce32e4c 100644
--- a/net/netfilter/nft_set_hash.c
+++ b/net/netfilter/nft_set_hash.c
@@ -412,9 +412,17 @@ static void nft_rhash_destroy(const struct nft_set *set)
(void *)set);
}
+/* Number of buckets is stored in u32, so cap our result to 1U<<31 */
+#define NFT_MAX_BUCKETS (1U << 31)
+
static u32 nft_hash_buckets(u32 size)
{
- return roundup_pow_of_two(size * 4 / 3);
+ u64 val = div_u64((u64)size * 4, 3);
+
+ if (val >= NFT_MAX_BUCKETS)
+ return NFT_MAX_BUCKETS;
+
+ return roundup_pow_of_two(val);
}
static bool nft_rhash_estimate(const struct nft_set_desc *desc, u32 features,