From: Mathias Krause Date: Sun, 7 Apr 2013 01:51:47 +0000 (+0000) Subject: atm: update msg_namelen in vcc_recvmsg() X-Git-Tag: v2.6.34.15~183 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=be217bff917544cda30abac24fab22f175d1044e;p=thirdparty%2Fkernel%2Fstable.git atm: update msg_namelen in vcc_recvmsg() commit 9b3e617f3df53822345a8573b6d358f6b9e5ed87 upstream. 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: Mathias Krause Signed-off-by: David S. Miller Signed-off-by: Paul Gortmaker --- diff --git a/net/atm/common.c b/net/atm/common.c index ec2cb8f3c8d99..4ccc872209f08 100644 --- a/net/atm/common.c +++ b/net/atm/common.c @@ -475,6 +475,8 @@ int vcc_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, struct sk_buff *skb; int copied, error = -EINVAL; + msg->msg_namelen = 0; + if (sock->state != SS_CONNECTED) return -ENOTCONN; if (flags & ~MSG_DONTWAIT) /* only handle MSG_DONTWAIT */