diff options
| author | Mateusz Jurczyk <mjurczyk@google.com> | 2017-06-13 18:44:28 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-27 15:03:24 -0700 |
| commit | 6978dd966b934d9812f4e485b8c6ece4d8e21cef (patch) | |
| tree | 2f08290751804bf1e726702869e93f1ca5172e8b | |
| parent | c33d96a7a54d152599471e344063d5917b339014 (diff) | |
| download | linux-stable-6978dd966b934d9812f4e485b8c6ece4d8e21cef.tar.gz linux-stable-6978dd966b934d9812f4e485b8c6ece4d8e21cef.tar.bz2 linux-stable-6978dd966b934d9812f4e485b8c6ece4d8e21cef.zip | |
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: Mateusz Jurczyk <mjurczyk@google.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/nfc/llcp_sock.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c index 2430e9b00fe7..499e9483e3ee 100644 --- a/net/nfc/llcp_sock.c +++ b/net/nfc/llcp_sock.c @@ -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); |