aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMathias Krause2013-04-06 20:51:47 -0500
committerGreg Kroah-Hartman2013-05-01 11:46:00 -0500
commit5ee96cca09c7be84ed921150dde4ff34b724377f (patch)
tree2e9bc6ea50048bf56e14c1bd9539624b33c9ec69 /net
parent619aeac5a41c5845758a848c800b0197ed6027ff (diff)
downloadkernel-video-5ee96cca09c7be84ed921150dde4ff34b724377f.tar.gz
kernel-video-5ee96cca09c7be84ed921150dde4ff34b724377f.tar.xz
kernel-video-5ee96cca09c7be84ed921150dde4ff34b724377f.zip
atm: update msg_namelen in vcc_recvmsg()
[ Upstream commit 9b3e617f3df53822345a8573b6d358f6b9e5ed87 ] 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 <minipli@googlemail.com> 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/atm/common.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/atm/common.c b/net/atm/common.c
index 806fc0a4005..cf4b7e667a6 100644
--- a/net/atm/common.c
+++ b/net/atm/common.c
@@ -532,6 +532,8 @@ int vcc_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
532 struct sk_buff *skb; 532 struct sk_buff *skb;
533 int copied, error = -EINVAL; 533 int copied, error = -EINVAL;
534 534
535 msg->msg_namelen = 0;
536
535 if (sock->state != SS_CONNECTED) 537 if (sock->state != SS_CONNECTED)
536 return -ENOTCONN; 538 return -ENOTCONN;
537 539