Skip to content

Commit c77a4b9

Browse files
miniplidavem330
authored andcommitted
llc: Fix missing msg_namelen update in llc_ui_recvmsg()
For stream sockets the code misses to update the msg_namelen member to 0 and therefore makes net/socket.c leak the local, uninitialized sockaddr_storage variable to userland -- 128 bytes of kernel stack memory. The msg_namelen update is also missing for datagram sockets in case the socket is shutting down during receive. Fix both issues by setting msg_namelen to 0 early. It will be updated later if we're going to fill the msg_name member. Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Signed-off-by: Mathias Krause <minipli@googlemail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent b860d3c commit c77a4b9

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

Diff for: net/llc/af_llc.c

+2
Original file line numberDiff line numberDiff line change
@@ -720,6 +720,8 @@ static int llc_ui_recvmsg(struct kiocb *iocb, struct socket *sock,
720720
int target; /* Read at least this many bytes */
721721
long timeo;
722722

723+
msg->msg_namelen = 0;
724+
723725
lock_sock(sk);
724726
copied = -ENOTCONN;
725727
if (unlikely(sk->sk_type == SOCK_STREAM && sk->sk_state == TCP_LISTEN))

0 commit comments

Comments
 (0)