From: Mathias Krause Date: Sun, 7 Apr 2013 01:51:56 +0000 (+0000) Subject: llc: Fix missing msg_namelen update in llc_ui_recvmsg() X-Git-Tag: v2.6.34.15~189 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89b258e930ecf55c2c9a7c0fb0c428dc45f87980;p=thirdparty%2Fkernel%2Fstable.git llc: Fix missing msg_namelen update in llc_ui_recvmsg() commit c77a4b9cffb6215a15196ec499490d116dfad181 upstream. 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 Signed-off-by: Mathias Krause Signed-off-by: David S. Miller Signed-off-by: Paul Gortmaker --- diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c index 06010e1e89f9a..121c92e3c1286 100644 --- a/net/llc/af_llc.c +++ b/net/llc/af_llc.c @@ -719,6 +719,8 @@ static int llc_ui_recvmsg(struct kiocb *iocb, struct socket *sock, int target; /* Read at least this many bytes */ long timeo; + msg->msg_namelen = 0; + lock_sock(sk); copied = -ENOTCONN; if (unlikely(sk->sk_type == SOCK_STREAM && sk->sk_state == TCP_LISTEN))