Unverified Commit 57a701dd authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15116 netfilter: conntrack: clamp maximum hashtable size to INT_MAX 

Merge Pull Request from: @ci-robot 
 
PR sync from: Dong Chenchen <dongchenchen2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/OHQL43FISXGJMVSEAGV6VQ5TJTSBU4NA/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBIQQN 
 
Link:https://gitee.com/openeuler/kernel/pulls/15116

 

Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents 2f9e5e28 3ffb502d

net/netfilter/nf_conntrack_core.c

+4 −1
Original line number Diff line number Diff line
@@ -2314,12 +2314,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 = kvmalloc_array(nr_slots, sizeof(struct hlist_nulls_head),

			      GFP_KERNEL | __GFP_ZERO);