Patchwork [07/16] irda: Fix missing msg_namelen update in irda_recvmsg_dgram()

login
register
mail settings
Submitter Mathias Krause
Date April 7, 2013, 11:51 a.m.
Message ID <1365335522-29931-8-git-send-email-minipli@googlemail.com>
Download mbox | patch
Permalink /patch/234483/
State Accepted
Delegated to: David Miller
Headers show

Comments

Mathias Krause - April 7, 2013, 11:51 a.m.
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 <samuel@sortiz.org>
Signed-off-by: Mathias Krause <minipli@googlemail.com>
---
 net/irda/af_irda.c |    2 ++
 1 file changed, 2 insertions(+)

Patch

diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index d28e7f0..e493b33 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)