Commit d26e2c9f authored May 28, 2015 by Bernhard Thaler Committed by Pablo Neira Ayuso Jun 01, 2015

Revert "netfilter: ensure number of counters is >0 in do_replace()"



This partially reverts commit 1086bbe9 ("netfilter: ensure number of
counters is >0 in do_replace()") in net/bridge/netfilter/ebtables.c.

Setting rules with ebtables does not work any more with 1086bbe9 place.

There is an error message and no rules set in the end.

e.g.

~# ebtables -t nat -A POSTROUTING --src 12:34:56:78:9a:bc -j DROP
Unable to update the kernel. Two possible causes:
1. Multiple ebtables programs were executing simultaneously. The ebtables
   userspace tool doesn't by default support multiple ebtables programs
running

Reverting the ebtables part of 1086bbe9 makes this work again.

Signed-off-by: Bernhard Thaler <bernhard.thaler@wvnet.at>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

parent 9302d7bb

net/bridge/netfilter/ebtables.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -1117,8 +1117,6 @@ static int do_replace(struct net net, const void __user user,
		return -ENOMEM;
		if (tmp.num_counters >= INT_MAX / sizeof(struct ebt_counter))
		return -ENOMEM;
		if (tmp.num_counters == 0)
		return -EINVAL;

		tmp.name[sizeof(tmp.name) - 1] = 0;

		@@ -2161,8 +2159,6 @@ static int compat_copy_ebt_replace_from_user(struct ebt_replace *repl,
		return -ENOMEM;
		if (tmp.num_counters >= INT_MAX / sizeof(struct ebt_counter))
		return -ENOMEM;
		if (tmp.num_counters == 0)
		return -EINVAL;

		memcpy(repl, &tmp, offsetof(struct ebt_replace, hook_entry));