netfilter: conntrack: clamp maximum hashtable size to INT_MAX
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter: conntrack: clamp maximum hashtable size to INT_MAX
According to 0708a0afe291 ("mm: Consider __GFP_NOWARN flag for oversized kvmalloc() calls"), use INT_MAX as maximum size for the conntrack hashtable. Otherwise, it is possible to hit WARN_ON_ONCE in __kvmalloc_node_noprof() when __GFP_NOWARN flag is unset when resizing.
Note: hashtable resize is only possible from init_netns.
Fixes 9cc1c73ad666 ("netfilter: conntrack: avoid integer overflow when resizing")
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- net/netfilter/nf_conntrack_core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
net/netfilter/nf_conntrack_core.c +4 -1
@@ -2510,12 +2510,15 @@ void *nf_ct_alloc_hashtable(unsigned int *sizep, int nulls)struct hlist_nulls_head *hash;unsigned int nr_slots, i; -if (*sizep > (UINT_MAX /sizeof (struct hlist_nulls_head ))) +if (*sizep > (INT_MAX /sizeof (struct hlist_nulls_head )))return NULL ;BUILD_BUG_ON (sizeof (struct hlist_nulls_head ) !=sizeof (struct hlist_head )); nr_slots = *sizep =roundup (*sizep,PAGE_SIZE /sizeof (struct hlist_nulls_head )); +if (nr_slots > (INT_MAX /sizeof (struct hlist_nulls_head ))) +return NULL ; + hash =kvcalloc (nr_slots,sizeof (struct hlist_nulls_head ),GFP_KERNEL );if (hash && nulls)
Signature · 1 line
2.30.2