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

Commit e453581d authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf 



Pablo Neira Ayuso says:

====================
Netfilter fix for net

The following patch reverts the ebtables chunk that enforces counters that was
introduced in the recently applied d26e2c9f ('Revert "netfilter: ensure
number of counters is >0 in do_replace()"') since this breaks ebtables.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents cd842a67 d26e2c9f

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));