Merge "netfilter: x_tables: cap allocations at 512 mbyte" (fa4bfca0) · Commits · e / devices / android_kernel_fairphone_FP3

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 */
		@@ -984,7 +985,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;

		if (sz <= (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER))