From ceab65392adcdb9fb55e4ceffb07b13bf03d2103 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Thu, 31 Jan 2008 04:35:57 -0800
Subject: [PATCH] --- yaml --- r: 81913 b: refs/heads/master c:
 1d670fdc8c14780b8e0ad915ad3bb13b2fd9223b h: refs/heads/master i:   81911:
 fa57bce4a3211871bb3c8e672df04104c7c371c0 v: v3

---
 [refs]                                     | 2 +-
 trunk/net/netfilter/nf_conntrack_netlink.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 326a001b2add..bb8c8b981d5d 100644
--- 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
index 38141f104db7..bdae2924d425 100644
--- 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) {