summaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorDavid S. Miller2009-04-08 22:39:54 +0200
committerDavid S. Miller2009-04-08 22:39:54 +0200
commitfd1cc4802482d13ba1dbc44b390c5a6b16411a03 (patch)
treec9ce26890f0e8da455396121e3f8ed4dfb9daad2 /net/ipv6
parentLinux 2.6.30-rc1 (diff)
parentnetfilter: ctnetlink: fix regression in expectation handling (diff)
downloadkernel-qcow2-linux-fd1cc4802482d13ba1dbc44b390c5a6b16411a03.tar.gz
kernel-qcow2-linux-fd1cc4802482d13ba1dbc44b390c5a6b16411a03.tar.xz
kernel-qcow2-linux-fd1cc4802482d13ba1dbc44b390c5a6b16411a03.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/netfilter/ip6_tables.c2
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)
xt_free_table_info(info);
+ return counters;
+
free_counters:
vfree(counters);
nomem: