Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1665088

[PATCH] caif: Add sockaddr length check before accessing sa_family in connect handler

From Mateusz Jurczyk <mjurczyk@google.com>
Newsgroups linux.kernel
Subject [PATCH] caif: Add sockaddr length check before accessing sa_family in connect handler
Date 2017-06-13 20:10 +0200
Message-ID <tRYqm-2Pr-11@gated-at.bofh.it> (permalink)
Organization linux.* mail to news gateway

Show all headers | View raw


Verify that the caller-provided sockaddr structure is large enough to
contain the sa_family field, before accessing it in the connect()
handler of the AF_CAIF 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>
---
 net/caif/caif_socket.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
index adcad344c843..21f18ea2fce4 100644
--- a/net/caif/caif_socket.c
+++ b/net/caif/caif_socket.c
@@ -754,6 +754,10 @@ static int caif_connect(struct socket *sock, struct sockaddr *uaddr,
 
 	lock_sock(sk);
 
+	err = -EINVAL;
+	if (addr_len < offsetofend(struct sockaddr, sa_family))
+		goto out;
+
 	err = -EAFNOSUPPORT;
 	if (uaddr->sa_family != AF_CAIF)
 		goto out;
-- 
2.13.1.508.gb3defc5cc-goog

Back to linux.kernel | Previous | Next | Find similar | Unroll thread


Thread

[PATCH] caif: Add sockaddr length check before accessing sa_family in connect handler Mateusz Jurczyk <mjurczyk@google.com> - 2017-06-13 20:10 +0200

csiph-web