openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz 2012-05-21 11:44:42 +02:00
parent dadb06f270
commit 5a0f6f3b46
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/nfc/llcp/llcp.c
View File

@ -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) { sk_for_each(sk, node, &local->connecting_sockets.head) {
llcp_sock = nfc_llcp_sock(sk); llcp_sock = nfc_llcp_sock(sk);
if (llcp_sock->ssap == ssap) if (llcp_sock->ssap == ssap) {
sock_hold(&llcp_sock->sk);
goto out; goto out;
}
} }
llcp_sock = NULL; llcp_sock = NULL;
@ -486,8 +488,6 @@ static struct nfc_llcp_sock *nfc_llcp_connecting_sock_get(struct nfc_llcp_local
out: out:
read_unlock(&local->connecting_sockets.lock); read_unlock(&local->connecting_sockets.lock);
sock_hold(&llcp_sock->sk);
return llcp_sock; return llcp_sock;
} }