diff options
| author | Patrick McHardy <kaber@trash.net> | 2007-01-15 10:28:28 +0100 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2007-02-05 08:31:41 -0800 |
| commit | 5624ef14c74b5e8237ef09aba7f5bfd2cb56f793 (patch) | |
| tree | 3c74c0677ba15d2a596562534cf628a0de160652 | |
| parent | 17265a2000e702e0ff79924de616ce561e49c00f (diff) | |
| download | kernel-adaptation-pc-5624ef14c74b5e8237ef09aba7f5bfd2cb56f793.tar.gz kernel-adaptation-pc-5624ef14c74b5e8237ef09aba7f5bfd2cb56f793.tar.bz2 kernel-adaptation-pc-5624ef14c74b5e8237ef09aba7f5bfd2cb56f793.zip | |
[PATCH] NETFILTER: ctnetlink: fix leak in ctnetlink_create_conntrack error path
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
| -rw-r--r-- | net/ipv4/netfilter/ip_conntrack_netlink.c | 2 | ||||
| -rw-r--r-- | net/netfilter/nf_conntrack_netlink.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_netlink.c b/net/ipv4/netfilter/ip_conntrack_netlink.c index 39f23f47eb3..424f2fcd249 100644 --- a/net/ipv4/netfilter/ip_conntrack_netlink.c +++ b/net/ipv4/netfilter/ip_conntrack_netlink.c @@ -955,7 +955,7 @@ ctnetlink_create_conntrack(struct nfattr *cda[], if (cda[CTA_PROTOINFO-1]) { err = ctnetlink_change_protoinfo(ct, cda); if (err < 0) - return err; + goto err; } #if defined(CONFIG_IP_NF_CONNTRACK_MARK) diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index c650cccb681..4c2e69a7de8 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c @@ -972,7 +972,7 @@ ctnetlink_create_conntrack(struct nfattr *cda[], if (cda[CTA_PROTOINFO-1]) { err = ctnetlink_change_protoinfo(ct, cda); if (err < 0) - return err; + goto err; } #if defined(CONFIG_NF_CONNTRACK_MARK) |