Commit 7bbc3d38 authored by Jozsef Kadlecsik's avatar Jozsef Kadlecsik Committed by Pablo Neira Ayuso
Browse files

netfilter: ipset: Fix oversized kvmalloc() calls 



The commit

commit 7661809d
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Jul 14 09:45:49 2021 -0700

    mm: don't allow oversized kvmalloc() calls

limits the max allocatable memory via kvmalloc() to MAX_INT. Apply the
same limit in ipset.

Reported-by: default avatar <syzbot+3493b1873fb3ea827986@syzkaller.appspotmail.com>
Reported-by: default avatar <syzbot+2b8443c35458a617c904@syzkaller.appspotmail.com>
Reported-by: default avatar <syzbot+ee5cb15f4a0e85e0d54e@syzkaller.appspotmail.com>
Signed-off-by: default avatarJozsef Kadlecsik <kadlec@netfilter.org>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 276aae37

net/netfilter/ipset/ip_set_hash_gen.h

+2 −2
Original line number Diff line number Diff line
@@ -130,11 +130,11 @@ htable_size(u8 hbits) 
{

	size_t hsize;



	/* We must fit both into u32 in jhash and size_t */

	/* We must fit both into u32 in jhash and INT_MAX in kvmalloc_node() */

	if (hbits > 31)

		return 0;

	hsize = jhash_size(hbits);

	if ((((size_t)-1) - sizeof(struct htable)) / sizeof(struct hbucket *)

	if ((INT_MAX - sizeof(struct htable)) / sizeof(struct hbucket *)

	    < hsize)

		return 0;