diff options
| author | Eric Dumazet <dada1@cosmosbay.com> | 2009-04-06 11:06:55 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2009-04-06 11:06:55 -0400 |
| commit | 49a88d18a1721ac14dbc67cd390db18ee1f3a42f (patch) | |
| tree | 67a1b884546e887ded8b4ff3b9c1ff71de9a5335 /net/ipv6 | |
| parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) | |
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/ipv6')
| -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 dfed176aed37..800ae8542471 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) | |||
| 1033 | 1033 | ||
| 1034 | xt_free_table_info(info); | 1034 | xt_free_table_info(info); |
| 1035 | 1035 | ||
| 1036 | return counters; | ||
| 1037 | |||
| 1036 | free_counters: | 1038 | free_counters: |
| 1037 | vfree(counters); | 1039 | vfree(counters); |
| 1038 | nomem: | 1040 | nomem: |