summaryrefslogtreecommitdiffstats
path: root/net/nfc
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2012-10-15 15:08:29 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2012-10-26 18:26:49 +0200
commit54292d64e1b6cbe735852aaf59e56ef78dc15f82 (patch)
tree50a1e428bb10ae92e75f8aa380680f07e468ebaf /net/nfc
parente6904081dd2ff22b861d976810a55322b5aece82 (diff)
downloadblackbird-op-linux-54292d64e1b6cbe735852aaf59e56ef78dc15f82.tar.gz
blackbird-op-linux-54292d64e1b6cbe735852aaf59e56ef78dc15f82.zip
NFC: Check for connection less sockets when looking for a service name
Connection less server sockets will be in BOUND state, not LISTEN. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc')
-rw-r--r--net/nfc/llcp/llcp.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/net/nfc/llcp/llcp.c b/net/nfc/llcp/llcp.c
index dd2cc0e48a1d..ee01be17e21f 100644
--- a/net/nfc/llcp/llcp.c
+++ b/net/nfc/llcp/llcp.c
@@ -249,7 +249,12 @@ struct nfc_llcp_sock *nfc_llcp_sock_from_sn(struct nfc_llcp_local *local,
pr_debug("llcp sock %p\n", tmp_sock);
- if (tmp_sock->sk.sk_state != LLCP_LISTEN)
+ if (tmp_sock->sk.sk_type == SOCK_STREAM &&
+ tmp_sock->sk.sk_state != LLCP_LISTEN)
+ continue;
+
+ if (tmp_sock->sk.sk_type == SOCK_DGRAM &&
+ tmp_sock->sk.sk_state != LLCP_BOUND)
continue;
if (tmp_sock->service_name == NULL ||
OpenPOWER on IntegriCloud