diff options
| author | Mathias Krause <minipli@googlemail.com> | 2013-04-07 01:51:53 +0000 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2013-06-10 11:43:46 +0200 |
| commit | 21f908c9c285c0e9a1148aef6243caf6930bc158 (patch) | |
| tree | 2035da770a62eea04070e5bda0c8432f8ee8572f /net | |
| parent | 3cab351d977035a0f397491d3266a15eb8e363dc (diff) | |
irda: Fix missing msg_namelen update in irda_recvmsg_dgram()
commit 5ae94c0d2f0bed41d6718be743985d61b7f5c47d upstream.
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.
Cc: Samuel Ortiz <samuel@sortiz.org>
Signed-off-by: Mathias Krause <minipli@googlemail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[dannf: adjusted to apply to Debian's 2.6.32]
Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'net')
| -rw-r--r-- | net/irda/af_irda.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c index 476b24ee7b71..bfb325de67cf 100644 --- a/net/irda/af_irda.c +++ b/net/irda/af_irda.c @@ -1338,6 +1338,8 @@ static int irda_recvmsg_dgram(struct kiocb *iocb, struct socket *sock, if ((err = sock_error(sk)) < 0) return err; + msg->msg_namelen = 0; + skb = skb_recv_datagram(sk, flags & ~MSG_DONTWAIT, flags & MSG_DONTWAIT, &err); if (!skb) |