From 265c1a403396e3dc5b18139a6e65bfd1809f8fd8 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Tue, 6 Sep 2005 15:11:10 -0700
Subject: [PATCH] --- yaml --- r: 7553 b: refs/heads/master c:
 e4466399398a2ec854776e9eca2b4415b40bd1ff h: refs/heads/master i:   7551:
 3a74a2cda73ffd357fb77f29094a10da0ace1164 v: v3

---
 [refs]                                            | 2 +-
 trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ea217228b30b..07d201be80a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49719eb355d32fa07793017b4b46b1c02e88b275
+refs/heads/master: e4466399398a2ec854776e9eca2b4415b40bd1ff
diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c b/trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
index f23ef1f88c46..1985abc59d24 100644
--- a/trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
+++ b/trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
@@ -349,6 +349,7 @@ static int tcp_to_nfattr(struct sk_buff *skb, struct nfattr *nfa,
 	return 0;
 
 nfattr_failure:
+	read_unlock_bh(&tcp_lock);
 	return -1;
 }
 #endif