Эх сурвалжийг харах

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>
Samuel Ortiz 13 жил өмнө
parent
commit
c66433dc5d

+ 2 - 2
net/nfc/llcp/sock.c

@@ -78,11 +78,11 @@ static int llcp_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
 	struct sockaddr_nfc_llcp llcp_addr;
 	struct sockaddr_nfc_llcp llcp_addr;
 	int len, ret = 0;
 	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)
 	if (!addr || addr->sa_family != AF_NFC)
 		return -EINVAL;
 		return -EINVAL;
 
 
+	pr_debug("sk %p addr %p family %d\n", sk, addr, addr->sa_family);
+
 	memset(&llcp_addr, 0, sizeof(llcp_addr));
 	memset(&llcp_addr, 0, sizeof(llcp_addr));
 	len = min_t(unsigned int, sizeof(llcp_addr), alen);
 	len = min_t(unsigned int, sizeof(llcp_addr), alen);
 	memcpy(&llcp_addr, addr, len);
 	memcpy(&llcp_addr, addr, len);