diff options
| author | Eric Dumazet <dada1@cosmosbay.com> | 2009-04-06 17:06:55 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2009-04-06 17:06:55 +0200 |
| commit | 49a88d18a1721ac14dbc67cd390db18ee1f3a42f (patch) | |
| tree | 67a1b884546e887ded8b4ff3b9c1ff71de9a5335 /net | |
| parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) | |
| download | linux-3.10-49a88d18a1721ac14dbc67cd390db18ee1f3a42f.tar.gz linux-3.10-49a88d18a1721ac14dbc67cd390db18ee1f3a42f.tar.bz2 linux-3.10-49a88d18a1721ac14dbc67cd390db18ee1f3a42f.zip | |
netfilter: ip6tables regression fix
Commit 7845447 (netfilter: iptables: lock free counters) broke
ip6_tables by unconditionally returning ENOMEM in alloc_counters(),
Reported-by: Graham Murray <graham@gmurray.org.uk>
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/netfilter/ip6_tables.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c index dfed176aed3..800ae854247 100644 --- a/net/ipv6/netfilter/ip6_tables.c +++ b/net/ipv6/netfilter/ip6_tables.c @@ -1033,6 +1033,8 @@ static struct xt_counters *alloc_counters(struct xt_table *table) xt_free_table_info(info); + return counters; + free_counters: vfree(counters); nomem: |