diff --git a/[refs] b/[refs] index d9141b41b12c..62f3029b63b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d012d04e4d6312ea157b6cf19e9689af934f5aa7 +refs/heads/master: 58d1eab7ef1d7ff8e448699dfd1a21b7f3303296 diff --git a/trunk/net/nfc/llcp/sock.c b/trunk/net/nfc/llcp/sock.c index 3f339b19d140..17a707db40eb 100644 --- a/trunk/net/nfc/llcp/sock.c +++ b/trunk/net/nfc/llcp/sock.c @@ -292,6 +292,9 @@ static int llcp_sock_getname(struct socket *sock, struct sockaddr *addr, pr_debug("%p\n", sk); + if (llcp_sock == NULL) + return -EBADFD; + addr->sa_family = AF_NFC; *len = sizeof(struct sockaddr_nfc_llcp);