UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

NFC: Return NULL when no LLCP socket for a dsap,ssap couple is found 

The previous code was always returning the last socket from the
LLCP socket list.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz 2012-10-16 21:15:59 +02:00
parent b874dec21d
commit a8df0f3792
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,7 +144,7 @@ static struct nfc_llcp_sock *nfc_llcp_sock_get(struct nfc_llcp_local *local,
{ {
struct sock *sk; struct sock *sk;
struct hlist_node *node; struct hlist_node *node;
struct nfc_llcp_sock *llcp_sock; struct nfc_llcp_sock *llcp_sock, *tmp_sock;
pr_debug("ssap dsap %d %d\n", ssap, dsap); pr_debug("ssap dsap %d %d\n", ssap, dsap);
@ -156,10 +156,12 @@ static struct nfc_llcp_sock *nfc_llcp_sock_get(struct nfc_llcp_local *local,
llcp_sock = NULL; llcp_sock = NULL;
sk_for_each(sk, node, &local->sockets.head) { sk_for_each(sk, node, &local->sockets.head) {
llcp_sock = nfc_llcp_sock(sk); tmp_sock = nfc_llcp_sock(sk);
if (llcp_sock->ssap == ssap && llcp_sock->dsap == dsap) if (tmp_sock->ssap == ssap && tmp_sock->dsap == dsap) {
llcp_sock = tmp_sock;
break; break;
}
} }
read_unlock(&local->sockets.lock); read_unlock(&local->sockets.lock);
@ -1073,7 +1075,7 @@ static void nfc_llcp_recv_dm(struct nfc_llcp_local *local, struct sk_buff *skb)
} }
if (llcp_sock == NULL) { if (llcp_sock == NULL) {
pr_err("Invalid DM\n"); pr_debug("Already closed\n");
return; return;
} }