diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2012-06-29 06:03:55 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-07-09 16:42:22 -0400 |
commit | c66433dc5dda15861dcbac63a97645771d14feb6 (patch) | |
tree | 5b7571d461d2df8fd2fa5d430352273fafdbc8f8 /net/nfc | |
parent | a831b9132065e1aa18acd7910d5f9c164a2f350f (diff) |
NFC: Dereference LLCP bind socket address after checking for it to be NULL
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc')
-rw-r--r-- | net/nfc/llcp/sock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/nfc/llcp/sock.c b/net/nfc/llcp/sock.c index e5d80142b825..6152d05f8378 100644 --- a/net/nfc/llcp/sock.c +++ b/net/nfc/llcp/sock.c | |||
@@ -78,11 +78,11 @@ static int llcp_sock_bind(struct socket *sock, struct sockaddr *addr, int alen) | |||
78 | struct sockaddr_nfc_llcp llcp_addr; | 78 | struct sockaddr_nfc_llcp llcp_addr; |
79 | int len, ret = 0; | 79 | int len, ret = 0; |
80 | 80 | ||
81 | pr_debug("sk %p addr %p family %d\n", sk, addr, addr->sa_family); | ||
82 | |||
83 | if (!addr || addr->sa_family != AF_NFC) | 81 | if (!addr || addr->sa_family != AF_NFC) |
84 | return -EINVAL; | 82 | return -EINVAL; |
85 | 83 | ||
84 | pr_debug("sk %p addr %p family %d\n", sk, addr, addr->sa_family); | ||
85 | |||
86 | memset(&llcp_addr, 0, sizeof(llcp_addr)); | 86 | memset(&llcp_addr, 0, sizeof(llcp_addr)); |
87 | len = min_t(unsigned int, sizeof(llcp_addr), alen); | 87 | len = min_t(unsigned int, sizeof(llcp_addr), alen); |
88 | memcpy(&llcp_addr, addr, len); | 88 | memcpy(&llcp_addr, addr, len); |