Merge "netfilter: x_tables: remove size check" (a5a8825c) · Commits · e / devices / android_kernel_fairphone_FP3

net/netfilter/x_tables.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -987,14 +987,12 @@ struct xt_table_info *xt_alloc_table_info(unsigned int size)
		if (sz < sizeof(*info))
		return NULL;

		/* Pedantry: prevent them from hitting BUG() in vmalloc.c --RR */
		if ((size >> PAGE_SHIFT) + 2 > totalram_pages)
		return NULL;

		if (sz <= (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER))
		info = kmalloc(sz, GFP_KERNEL \| __GFP_NOWARN \| __GFP_NORETRY);
		if (!info) {
		info = vmalloc(sz);
		info = __vmalloc(sz, GFP_KERNEL \| __GFP_NOWARN \|
		__GFP_NORETRY \| __GFP_HIGHMEM,
		PAGE_KERNEL);
		if (!info)
		return NULL;
		}