Skip to content

L
linux-davinci-2.6.23
Commit c54ea3b9 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files
Options

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

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 334c8556
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
net/ipv4/netfilter/ip_conntrack_netlink.c
View file @ c54ea3b9
...@@ -959,7 +959,7 @@ ctnetlink_create_conntrack(struct nfattr *cda[], ...@@ -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)
......
net/netfilter/nf_conntrack_netlink.c
View file @ c54ea3b9
...@@ -981,7 +981,7 @@ ctnetlink_create_conntrack(struct nfattr *cda[], ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment