lkml.org 
[lkml]   [2013]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [ 183/184] irda: Fix missing msg_namelen update in
From
Date
On Tue, 2013-06-04 at 19:24 +0200, Willy Tarreau wrote:
> 2.6.32-longterm review patch. If anyone has any objections, please let me know.
>
> ------------------
> irda_recvmsg_dgram()
>
> From: Mathias Krause <minipli@googlemail.com>

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>
> ---
> net/irda/af_irda.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
> index 476b24e..bfb325d 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)

--
Ben Hutchings
Theory and practice are closer in theory than in practice.
- John Levine, moderator of comp.compilers
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-06-07 09:01    [W:0.500 / U:0.716 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site