summaryrefslogtreecommitdiff
path: root/net/caif
diff options
context:
space:
mode:
authorMathias Krause <minipli@googlemail.com>2013-04-07 01:51:52 +0000
committerDavid S. Miller <davem@davemloft.net>2013-04-07 16:28:01 -0400
commit2d6fbfe733f35c6b355c216644e08e149c61b271 (patch)
treeb68553f2ddc2564bf17b4e28c1c7ee363dd40517 /net/caif
parentc8c499175f7d295ef867335bceb9a76a2c3cdc38 (diff)
downloadlinux-3.10-2d6fbfe733f35c6b355c216644e08e149c61b271.tar.gz
linux-3.10-2d6fbfe733f35c6b355c216644e08e149c61b271.tar.bz2
linux-3.10-2d6fbfe733f35c6b355c216644e08e149c61b271.zip
caif: Fix missing msg_namelen update in caif_seqpkt_recvmsg()
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. Cc: Sjur Braendeland <sjur.brandeland@stericsson.com> Signed-off-by: Mathias Krause <minipli@googlemail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/caif')
-rw-r--r--net/caif/caif_socket.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
index 095259f8390..ff2ff3ce696 100644
--- a/net/caif/caif_socket.c
+++ b/net/caif/caif_socket.c
@@ -286,6 +286,8 @@ static int caif_seqpkt_recvmsg(struct kiocb *iocb, struct socket *sock,
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;