From 432460ec28c7725a30d369ac8ab970435a46969c Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Thu, 5 Jul 2012 17:43:08 +0200
Subject: [PATCH] --- yaml --- r: 315309 b: refs/heads/master c:
 fe3c094abc2365a226184554501fe0df87fe8271 h: refs/heads/master i:   315307:
 01999c316154a914793115f36084297a8888b397 v: v3

---
 [refs]                    | 2 +-
 trunk/net/nfc/llcp/sock.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b1029d4790b6..3e90225c1838 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01d719a2287ec34f631800d10f1fad3c134c3e89
+refs/heads/master: fe3c094abc2365a226184554501fe0df87fe8271
diff --git a/trunk/net/nfc/llcp/sock.c b/trunk/net/nfc/llcp/sock.c
index 6152d05f8378..ddeb9aa398f0 100644
--- a/trunk/net/nfc/llcp/sock.c
+++ b/trunk/net/nfc/llcp/sock.c
@@ -294,6 +294,9 @@ static int llcp_sock_getname(struct socket *sock, struct sockaddr *uaddr,
 	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);