summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorMathias Krause <minipli@googlemail.com>2013-04-07 01:51:56 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-01 09:41:05 -0700
commit40aea043862dd46aa865587223e084da2e3e37cf (patch)
tree5bc92d84d808aa2eac326ded541424736f78bf3f /net
parentdbd99572c687037ca7ddb31df2d7fd364732c670 (diff)
llc: Fix missing msg_namelen update in llc_ui_recvmsg()
[ Upstream commit c77a4b9cffb6215a15196ec499490d116dfad181 ] 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. Signed-off-by: Mathias Krause <minipli@googlemail.com> Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/llc/af_llc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index df08d7779e1d..e4d2fbb59a7e 100644
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -721,6 +721,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))