Browse Source

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

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Samuel Ortiz 13 years ago
parent
commit
5a0f6f3b46
1 changed files with 3 additions and 3 deletions
  1. 3 3
      net/nfc/llcp/llcp.c

+ 3 - 3
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;
 }