Commit 2a8c07b2 authored by Mathias Krause's avatar Mathias Krause Committed by Ben Hutchings

atm: update msg_namelen in vcc_recvmsg()

[ Upstream commit 9b3e617f ]

The current code does not fill the msg_name member in case it is set.
It also does not set 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.

Fix that by simply setting msg_namelen to 0 as obviously nobody cared
about vcc_recvmsg() not filling the msg_name in case it was set.
Signed-off-by: default avatarMathias Krause <minipli@googlemail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 60986f51
...@@ -500,6 +500,8 @@ int vcc_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, ...@@ -500,6 +500,8 @@ int vcc_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
struct sk_buff *skb; struct sk_buff *skb;
int copied, error = -EINVAL; int copied, error = -EINVAL;
msg->msg_namelen = 0;
if (sock->state != SS_CONNECTED) if (sock->state != SS_CONNECTED)
return -ENOTCONN; return -ENOTCONN;
if (flags & ~MSG_DONTWAIT) /* only handle MSG_DONTWAIT */ if (flags & ~MSG_DONTWAIT) /* only handle MSG_DONTWAIT */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment