aboutsummaryrefslogtreecommitdiff
path: root/net/netfilter
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2008-01-31 04:35:57 -0800
committerDavid S. Miller <davem@davemloft.net>2008-01-31 19:27:50 -0800
commit1d670fdc8c14780b8e0ad915ad3bb13b2fd9223b (patch)
tree38e9859d29174b271c66a65fab6c05f55e407a9a /net/netfilter
parent99fa5f53975b4c09beb5d11ed7418fee2dfb43e3 (diff)
[NETFILTER]: nf_conntrack_netlink: fix unbalanced locking
Properly drop nf_conntrack_lock on tuple parsing error. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter')
-rw-r--r--net/netfilter/nf_conntrack_netlink.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 38141f104db..bdae2924d42 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -1237,7 +1237,7 @@ ctnetlink_new_conntrack(struct sock *ctnl, struct sk_buff *skb,
CTA_TUPLE_MASTER,
u3);
if (err < 0)
- return err;
+ goto out_unlock;
master_h = __nf_conntrack_find(&master, NULL);
if (master_h == NULL) {