| From afe366fa45ba2fade1b06bb84841ece7586c670e Mon Sep 17 00:00:00 2001 |
| From: Mathias Krause <minipli@googlemail.com> |
| Date: Sun, 7 Apr 2013 01:51:53 +0000 |
| Subject: irda: Fix missing msg_namelen update in irda_recvmsg_dgram() |
| |
| |
| From: Mathias Krause <minipli@googlemail.com> |
| |
| [ 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. |
| |
| Signed-off-by: Mathias Krause <minipli@googlemail.com> |
| Cc: Samuel Ortiz <samuel@sortiz.org> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| net/irda/af_irda.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/net/irda/af_irda.c |
| +++ b/net/irda/af_irda.c |
| @@ -1386,6 +1386,8 @@ static int irda_recvmsg_dgram(struct kio |
| |
| IRDA_DEBUG(4, "%s()\n", __func__); |
| |
| + msg->msg_namelen = 0; |
| + |
| skb = skb_recv_datagram(sk, flags & ~MSG_DONTWAIT, |
| flags & MSG_DONTWAIT, &err); |
| if (!skb) |
