From: Mathias Krause Date: Sun, 7 Apr 2013 01:51:53 +0000 (+0000) Subject: irda: Fix missing msg_namelen update in irda_recvmsg_dgram() X-Git-Tag: v3.2.45~16 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=402fb9f974f158d747e6c6944336cd9af7f349b2;p=thirdparty%2Fkernel%2Fstable.git irda: Fix missing msg_namelen update in irda_recvmsg_dgram() [ Upstream commit 5ae94c0d2f0bed41d6718be743985d61b7f5c47d ] 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 irda_recvmsg_dgram() not filling the msg_name in case it was set. Cc: Samuel Ortiz Signed-off-by: Mathias Krause Signed-off-by: David S. Miller Signed-off-by: Ben Hutchings --- diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c index f4b49c5b5642a..91821e96dcec1 100644 --- a/net/irda/af_irda.c +++ b/net/irda/af_irda.c @@ -1386,6 +1386,8 @@ static int irda_recvmsg_dgram(struct kiocb *iocb, struct socket *sock, IRDA_DEBUG(4, "%s()\n", __func__); + msg->msg_namelen = 0; + skb = skb_recv_datagram(sk, flags & ~MSG_DONTWAIT, flags & MSG_DONTWAIT, &err); if (!skb)