From: Samuel Ortiz <sameo@linux.intel.com>
Date: Mon, 21 May 2012 09:44:42 +0000 (+0200)
Subject: NFC: Don't hold a NULL connecting LLCP socket lock
X-Git-Tag: next-20120724~65^2~554^2~6^2~14
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5a0f6f3b46b28310262ad9585b80062ef56c5362;p=karo-tx-linux.git

NFC: Don't hold a NULL connecting LLCP socket lock

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
---

diff --git a/net/nfc/llcp/llcp.c b/net/nfc/llcp/llcp.c
index 5705e6dffb32..b694313c2be5 100644
--- a/net/nfc/llcp/llcp.c
+++ b/net/nfc/llcp/llcp.c
@@ -477,8 +477,10 @@ static struct nfc_llcp_sock *nfc_llcp_connecting_sock_get(struct nfc_llcp_local
 	sk_for_each(sk, node, &local->connecting_sockets.head) {
 		llcp_sock = nfc_llcp_sock(sk);
 
-		if (llcp_sock->ssap == ssap)
+		if (llcp_sock->ssap == ssap) {
+			sock_hold(&llcp_sock->sk);
 			goto out;
+		}
 	}
 
 	llcp_sock = NULL;
@@ -486,8 +488,6 @@ static struct nfc_llcp_sock *nfc_llcp_connecting_sock_get(struct nfc_llcp_local
 out:
 	read_unlock(&local->connecting_sockets.lock);
 
-	sock_hold(&llcp_sock->sk);
-
 	return llcp_sock;
 }