diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2012-07-05 11:43:08 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-07-09 16:42:25 -0400 |
commit | fe3c094abc2365a226184554501fe0df87fe8271 (patch) | |
tree | 3ea791d11ba5b992f53ea492967becfab7024686 /net/nfc | |
parent | 01d719a2287ec34f631800d10f1fad3c134c3e89 (diff) |
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>
Diffstat (limited to 'net/nfc')
-rw-r--r-- | net/nfc/llcp/sock.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/nfc/llcp/sock.c b/net/nfc/llcp/sock.c index 6152d05f8378..ddeb9aa398f0 100644 --- a/net/nfc/llcp/sock.c +++ b/net/nfc/llcp/sock.c | |||
@@ -294,6 +294,9 @@ static int llcp_sock_getname(struct socket *sock, struct sockaddr *uaddr, | |||
294 | struct nfc_llcp_sock *llcp_sock = nfc_llcp_sock(sk); | 294 | struct nfc_llcp_sock *llcp_sock = nfc_llcp_sock(sk); |
295 | DECLARE_SOCKADDR(struct sockaddr_nfc_llcp *, llcp_addr, uaddr); | 295 | DECLARE_SOCKADDR(struct sockaddr_nfc_llcp *, llcp_addr, uaddr); |
296 | 296 | ||
297 | if (llcp_sock == NULL || llcp_sock->dev == NULL) | ||
298 | return -EBADFD; | ||
299 | |||
297 | pr_debug("%p %d %d %d\n", sk, llcp_sock->target_idx, | 300 | pr_debug("%p %d %d %d\n", sk, llcp_sock->target_idx, |
298 | llcp_sock->dsap, llcp_sock->ssap); | 301 | llcp_sock->dsap, llcp_sock->ssap); |
299 | 302 | ||