Skip to content

Commit

Permalink
caif: Add sockaddr length check before accessing sa_family in connect…
Browse files Browse the repository at this point in the history
… handler

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>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Mateusz Jurczyk authored and David S. Miller committed Jun 13, 2017
1 parent 7de8440 commit 20a3d5b
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions net/caif/caif_socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 20a3d5b

Please sign in to comment.