Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-17 02:36:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Mateusz Jurczyk <mjurczyk@google.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Mateusz Jurczyk 2017-06-13 18:44:28 +02:00 committed by Samuel Ortiz
parent 6f874bafac
commit f6a5885fc4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/nfc/llcp_sock.c
View File

@ -77,7 +77,8 @@ 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;
if (!addr || addr->sa_family != AF_NFC) if (!addr || alen < offsetofend(struct sockaddr, sa_family) ||
addr->sa_family != AF_NFC)
return -EINVAL; return -EINVAL;
pr_debug("sk %p addr %p family %d\n", sk, addr, addr->sa_family); pr_debug("sk %p addr %p family %d\n", sk, addr, addr->sa_family);
@ -151,7 +152,8 @@ static int llcp_raw_sock_bind(struct socket *sock, struct sockaddr *addr,
struct sockaddr_nfc_llcp llcp_addr; struct sockaddr_nfc_llcp llcp_addr;
int len, ret = 0; 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; return -EINVAL;
pr_debug("sk %p addr %p family %d\n", sk, addr, addr->sa_family); pr_debug("sk %p addr %p family %d\n", sk, addr, addr->sa_family);