diff options
| author | Mathias Krause <minipli@googlemail.com> | 2013-04-07 01:51:52 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-01 09:41:04 -0700 |
| commit | 3300687d7ebb7a8abd9945843629b09194d97430 (patch) | |
| tree | 295d964990f8c342f62b0816a04df330f309f5b6 | |
| parent | 2d97f68d03180ad0a47fdb7c02f0fecdac9ad9a7 (diff) | |
| download | linux-stable-3300687d7ebb7a8abd9945843629b09194d97430.tar.gz linux-stable-3300687d7ebb7a8abd9945843629b09194d97430.tar.bz2 linux-stable-3300687d7ebb7a8abd9945843629b09194d97430.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.
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>
| -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 5016fa57b623..24a68861881c 100644 --- a/net/caif/caif_socket.c +++ b/net/caif/caif_socket.c @@ -287,6 +287,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; |