[patch 20/59] NETFILTER: ctnetlink: fix leak in ctnetlink_create_conntrack error path

Chris Wright
2007-02-03T02:53:21Z

[-- Attachment #1: ctnetlink-fix-leak-in-ctnetlink_create_conntrack-error-path.patch --]
[-- Type: text/plain, Size: 1003 bytes --]

-stable review patch. If anyone has any objections, please let us know.
------------------

From: Patrick McHardy <kaber@trash.net>

---

net/ipv4/netfilter/ip_conntrack_netlink.c | 2 +-
net/netfilter/nf_conntrack_netlink.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

--- linux-2.6.19.2.orig/net/ipv4/netfilter/ip_conntrack_netlink.c
+++ linux-2.6.19.2/net/ipv4/netfilter/ip_conntrack_netlink.c
@@ -955,7 +955,7 @@ ctnetlink_create_conntrack(struct nfattr
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)
--- linux-2.6.19.2.orig/net/netfilter/nf_conntrack_netlink.c
+++ linux-2.6.19.2/net/netfilter/nf_conntrack_netlink.c
@@ -972,7 +972,7 @@ ctnetlink_create_conntrack(struct nfattr
if (cda[CTA_PROTOINFO-1]) {
err = ctnetlink_change_protoinfo(ct, cda);
if (err < 0)
- return err;
+ goto err;
}

#if defined(CONFIG_NF_CONNTRACK_MARK)

--