diff options
| author | Hannes Frederic Sowa <hannes@stressinduktion.org> | 2013-11-23 00:46:12 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-11-23 14:46:23 -0800 |
| commit | 85fbaa75037d0b6b786ff18658ddf0b4014ce2a4 (patch) | |
| tree | 7b0fdc3767421d9bc9c2157f6b652026fbff99dd /net/l2tp | |
| parent | ca15a078bd907df5fc1c009477869c5cbde3b753 (diff) | |
| download | renesas_kernel-85fbaa75037d0b6b786ff18658ddf0b4014ce2a4.tar.gz renesas_kernel-85fbaa75037d0b6b786ff18658ddf0b4014ce2a4.tar.bz2 renesas_kernel-85fbaa75037d0b6b786ff18658ddf0b4014ce2a4.zip | |
inet: fix addr_len/msg->msg_namelen assignment in recv_error and rxpmtu functions
Commit bceaa90240b6019ed73b49965eac7d167610be69 ("inet: prevent leakage
of uninitialized memory to user in recv syscalls") conditionally updated
addr_len if the msg_name is written to. The recv_error and rxpmtu
functions relied on the recvmsg functions to set up addr_len before.
As this does not happen any more we have to pass addr_len to those
functions as well and set it to the size of the corresponding sockaddr
length.
This broke traceroute and such.
Fixes: bceaa90240b6 ("inet: prevent leakage of uninitialized memory to user in recv syscalls")
Reported-by: Brad Spengler <spender@grsecurity.net>
Reported-by: Tom Labanowski
Cc: mpb <mpb.mail@gmail.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l2tp')
| -rw-r--r-- | net/l2tp/l2tp_ip6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c index cfd65304be6..d9b437e5500 100644 --- a/net/l2tp/l2tp_ip6.c +++ b/net/l2tp/l2tp_ip6.c @@ -665,7 +665,7 @@ static int l2tp_ip6_recvmsg(struct kiocb *iocb, struct sock *sk, *addr_len = sizeof(*lsa); if (flags & MSG_ERRQUEUE) - return ipv6_recv_error(sk, msg, len); + return ipv6_recv_error(sk, msg, len, addr_len); skb = skb_recv_datagram(sk, flags, noblock, &err); if (!skb) |