diff options
| author | David S. Miller <davem@davemloft.net> | 2015-06-02 01:56:43 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-02 01:56:43 +0200 |
| commit | e453581dd518f60b45a8d2b9cf344e2a87d5267e (patch) | |
| tree | 0d1cc178164471008f792827cdbc829d84c5bd17 | |
| parent | Merge tag 'wireless-drivers-for-davem-2015-06-01' of git://git.kernel.org/pub... (diff) | |
| parent | Revert "netfilter: ensure number of counters is >0 in do_replace()" (diff) | |
| download | linux-e453581dd518f60b45a8d2b9cf344e2a87d5267e.tar.xz linux-e453581dd518f60b45a8d2b9cf344e2a87d5267e.zip | |
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 d26e2c9ffa38 ('Revert "netfilter: ensure
number of counters is >0 in do_replace()"') since this breaks ebtables.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/bridge/netfilter/ebtables.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c index 24c7c96bf5f8..91180a7fc943 100644 --- a/net/bridge/netfilter/ebtables.c +++ b/net/bridge/netfilter/ebtables.c @@ -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)); |