| From 2eb568f45b28caf3f42bb797cf20cc54a3a87ba0 Mon Sep 17 00:00:00 2001 |
| From: Mathias Krause <minipli@googlemail.com> |
| Date: Sun, 7 Apr 2013 01:51:52 +0000 |
| Subject: caif: Fix missing msg_namelen update in caif_seqpkt_recvmsg() |
| |
| |
| From: Mathias Krause <minipli@googlemail.com> |
| |
| [ Upstream commit 2d6fbfe733f35c6b355c216644e08e149c61b271 ] |
| |
| 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 caif_seqpkt_recvmsg() not filling the msg_name in case it was |
| set. |
| |
| Signed-off-by: Mathias Krause <minipli@googlemail.com> |
| Cc: Sjur Braendeland <sjur.brandeland@stericsson.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| net/caif/caif_socket.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/net/caif/caif_socket.c |
| +++ b/net/caif/caif_socket.c |
| @@ -287,6 +287,8 @@ static int caif_seqpkt_recvmsg(struct ki |
| if (m->msg_flags&MSG_OOB) |
| goto read_error; |
| |
| + m->msg_namelen = 0; |
| + |
| skb = skb_recv_datagram(sk, flags, 0 , &ret); |
| if (!skb) |
| goto read_error; |
