Skip to content

Commit

Permalink
NFC: Dereference LLCP bind socket address after checking for it to be…
Browse files Browse the repository at this point in the history
… NULL

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
  • Loading branch information
Samuel Ortiz authored and John W. Linville committed Jul 9, 2012
1 parent a831b91 commit c66433d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions net/nfc/llcp/sock.c
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,11 @@ static int llcp_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
struct sockaddr_nfc_llcp llcp_addr;
int len, ret = 0;

pr_debug("sk %p addr %p family %d\n", sk, addr, addr->sa_family);

if (!addr || addr->sa_family != AF_NFC)
return -EINVAL;

pr_debug("sk %p addr %p family %d\n", sk, addr, addr->sa_family);

memset(&llcp_addr, 0, sizeof(llcp_addr));
len = min_t(unsigned int, sizeof(llcp_addr), alen);
memcpy(&llcp_addr, addr, len);
Expand Down

0 comments on commit c66433d

Please sign in to comment.