diff options
| author | Mathias Krause <minipli@googlemail.com> | 2013-04-07 01:51:52 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-05-13 15:02:39 +0100 |
| commit | 5bf0d2c0fe1a954f937be4ad1b3c63b34e08dc52 (patch) | |
| tree | d3aac1bf3163b6deca7f08a2fb0614bde99e911e /net | |
| parent | bbad6f725f1d1b92e5eb3a7c6a8875eeec955747 (diff) | |
| download | kernel-common-5bf0d2c0fe1a954f937be4ad1b3c63b34e08dc52.tar.gz kernel-common-5bf0d2c0fe1a954f937be4ad1b3c63b34e08dc52.tar.bz2 kernel-common-5bf0d2c0fe1a954f937be4ad1b3c63b34e08dc52.zip | |
caif: Fix missing msg_namelen update in caif_seqpkt_recvmsg()
[ 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.
Cc: Sjur Braendeland <sjur.brandeland@stericsson.com>
Signed-off-by: Mathias Krause <minipli@googlemail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net')
| -rw-r--r-- | net/caif/caif_socket.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c index a98628086452..53a8e37d020a 100644 --- a/net/caif/caif_socket.c +++ b/net/caif/caif_socket.c @@ -320,6 +320,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; |