Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6978dd96 authored by Mateusz Jurczyk's avatar Mateusz Jurczyk Committed by Greg Kroah-Hartman
Browse files

NFC: Add sockaddr length checks before accessing sa_family in bind handlers 



commit f6a5885fc4d68e7f25ffb42b9d8d80aebb3bacbb upstream.

Verify that the caller-provided sockaddr structure is large enough to
contain the sa_family field, before accessing it in bind() handlers of the
AF_NFC socket. Since the syscall doesn't enforce a minimum size of the
corresponding memory region, very short sockaddrs (zero or one byte long)
result in operating on uninitialized memory while referencing .sa_family.

Signed-off-by: default avatarMateusz Jurczyk <mjurczyk@google.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c33d96a7

net/nfc/llcp_sock.c

+4 −2
Original line number Diff line number Diff line
@@ -76,7 +76,8 @@ static int llcp_sock_bind(struct socket *sock, struct sockaddr *addr, int alen) 
	struct sockaddr_nfc_llcp llcp_addr;

	int len, ret = 0;



	if (!addr || addr->sa_family != AF_NFC)

	if (!addr || alen < offsetofend(struct sockaddr, sa_family) ||

	    addr->sa_family != AF_NFC)

		return -EINVAL;



	pr_debug("sk %p addr %p family %d\n", sk, addr, addr->sa_family);
@@ -150,7 +151,8 @@ static int llcp_raw_sock_bind(struct socket *sock, struct sockaddr *addr, 
	struct sockaddr_nfc_llcp llcp_addr;

	int len, ret = 0;



	if (!addr || addr->sa_family != AF_NFC)

	if (!addr || alen < offsetofend(struct sockaddr, sa_family) ||

	    addr->sa_family != AF_NFC)

		return -EINVAL;



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