Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fab0b3ce authored by Florian Westphal's avatar Florian Westphal Committed by Greg Kroah-Hartman
Browse files

netfilter: x_tables: cap allocations at 512 mbyte 



commit 19926968 upstream.

Arbitrary limit, however, this still allows huge rulesets
(> 1 million rules).  This helps with automated fuzzer as it prevents
oom-killer invocation.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 89f3232c

net/netfilter/x_tables.c

+2 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>"); 
MODULE_DESCRIPTION("{ip,ip6,arp,eb}_tables backend module");



#define XT_PCPU_BLOCK_SIZE 4096

#define XT_MAX_TABLE_SIZE	(512 * 1024 * 1024)



struct compat_delta {

	unsigned int offset; /* offset in kernel */
@@ -1031,7 +1032,7 @@ struct xt_table_info *xt_alloc_table_info(unsigned int size) 
	struct xt_table_info *info = NULL;

	size_t sz = sizeof(*info) + size;



	if (sz < sizeof(*info))

	if (sz < sizeof(*info) || sz >= XT_MAX_TABLE_SIZE)

		return NULL;



	/* Pedantry: prevent them from hitting BUG() in vmalloc.c --RR */