commit fe3c094abc2365a226184554501fe0df87fe8271
author Samuel Ortiz <sameo@linux.intel.com> Thu Jul 05 17:43:08 2012 +0200
committer John W. Linville <linville@tuxdriver.com> Mon Jul 09 16:42:25 2012 -0400
tree 3ea791d11ba5b992f53ea492967becfab7024686
parent 01d719a2287ec34f631800d10f1fad3c134c3e89

NFC: Check for llcp_sock and its device from llcp_sock_getname

They both can potentially be NULL.

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

net/nfc/llcp/sock.c

diff --git a/net/nfc/llcp/sock.c b/net/nfc/llcp/sock.c
index 6152d05..ddeb9aa 100644
--- a/net/nfc/llcp/sock.c
+++ b/net/nfc/llcp/sock.c
@@ -294,6 +294,9 @@
 	struct nfc_llcp_sock *llcp_sock = nfc_llcp_sock(sk);
 	DECLARE_SOCKADDR(struct sockaddr_nfc_llcp *, llcp_addr, uaddr);
 
+	if (llcp_sock == NULL || llcp_sock->dev == NULL)
+		return -EBADFD;
+
 	pr_debug("%p %d %d %d\n", sk, llcp_sock->target_idx,
 		 llcp_sock->dsap, llcp_sock->ssap);