]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[NETFILTER]: nf_conntrack_netlink: fix unbalanced locking
authorPatrick McHardy <kaber@trash.net>
Thu, 31 Jan 2008 12:35:57 +0000 (04:35 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 1 Feb 2008 03:27:50 +0000 (19:27 -0800)
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>
net/netfilter/nf_conntrack_netlink.c

index 38141f104db7cfda21817140dce88f1d02bb0747..bdae2924d4252384f459c2fb4dbe531013381e70 100644 (file)
@@ -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) {