Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

[NETFILTER]: ctnetlink: fix leak in ctnetlink_create_conntrack error path

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Patrick McHardy 18 years ago
parent
334c85569b
commit
c54ea3b95a
2 changed files with 2 additions and 2 deletions
Unified View Show Diff Stats
  1. 1 1
      net/ipv4/netfilter/ip_conntrack_netlink.c
  2. 1 1
      net/netfilter/nf_conntrack_netlink.c

+ 1 - 1
net/ipv4/netfilter/ip_conntrack_netlink.c
View File 

@@ -959,7 +959,7 @@ ctnetlink_create_conntrack(struct nfattr *cda[],
 
 	if (cda[CTA_PROTOINFO-1]) {
 
 	if (cda[CTA_PROTOINFO-1]) {
 
 		err = ctnetlink_change_protoinfo(ct, cda);
 
 		err = ctnetlink_change_protoinfo(ct, cda);
 
 		if (err < 0)
 
 		if (err < 0)
 
-			return err;
 
+			goto err;
 
 	}
 
 	}
 
 
 
 #if defined(CONFIG_IP_NF_CONNTRACK_MARK)
 
 #if defined(CONFIG_IP_NF_CONNTRACK_MARK)

+ 1 - 1
net/netfilter/nf_conntrack_netlink.c
View File 

@@ -981,7 +981,7 @@ ctnetlink_create_conntrack(struct nfattr *cda[],
 
 	if (cda[CTA_PROTOINFO-1]) {
 
 	if (cda[CTA_PROTOINFO-1]) {
 
 		err = ctnetlink_change_protoinfo(ct, cda);
 
 		err = ctnetlink_change_protoinfo(ct, cda);
 
 		if (err < 0)
 
 		if (err < 0)
 
-			return err;
 
+			goto err;
 
 	}
 
 	}
 
 
 
 #if defined(CONFIG_NF_CONNTRACK_MARK)
 
 #if defined(CONFIG_NF_CONNTRACK_MARK)