---

yaml --- r: 81913 b: refs/heads/master c: 1d670fd h: refs/heads/master i: 81911: fa57bce v: v3
git-mirror · Feb 1, 2008 · ceab653 · ceab653
1 parent 972646a
commit ceab653
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99fa5f53975b4c09beb5d11ed7418fee2dfb43e3
+refs/heads/master: 1d670fdc8c14780b8e0ad915ad3bb13b2fd9223b
diff --git a/trunk/net/netfilter/nf_conntrack_netlink.c b/trunk/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) {