[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1447168724.17135.73.camel@edumazet-glaptop2.roam.corp.google.com>
Date: Tue, 10 Nov 2015 07:18:44 -0800
From: Eric Dumazet <eric.dumazet@...il.com>
To: Hannes Frederic Sowa <hannes@...essinduktion.org>
Cc: netdev@...r.kernel.org, Dmitry Vyukov <dvyukov@...gle.com>
Subject: Re: [PATCH net v2] af-unix: fix use-after-free with concurrent
readers while splicing
On Tue, 2015-11-10 at 15:47 +0100, Hannes Frederic Sowa wrote:
> During splicing an af-unix socket to a pipe we have to drop all
> af-unix socket locks. While doing so we allow another reader to enter
> unix_stream_read_generic which can read, copy and finally free another
> skb. If exactly this skb is just in process of being spliced we get a
> use-after-free report by kasan.
>
> First, we must make sure to not have a free while the skb is used during
> the splice operation. We simply increment its use counter before unlocking
> the reader lock.
>
> Stream sockets have the nice characteristic that we don't care about
> zero length writes and they never reach the peer socket's queue. That
> said, we can take the UNIXCB.consumed field as the indicator if the
> skb was already freed from the socket's receive queue. If the skb was
> fully consumed after we locked the reader side again we know it has been
> dropped by a second reader. We indicate a short read to user space and
> abort the current splice operation.
>
> This bug has been found with syzkaller
> (http://github.com/google/syzkaller) by Dmitry Vyukov.
>
> Reported-by: Dmitry Vyukov <dvyukov@...gle.com>
> Cc: Dmitry Vyukov <dvyukov@...gle.com>
> Cc: Eric Dumazet <eric.dumazet@...il.com>
> Signed-off-by: Hannes Frederic Sowa <hannes@...essinduktion.org>
Please Hannes include the Fixes: tag.
As you might already know, patchwork does not catch it later
Fixes: 2b514574f7e8 ("net: af_unix: implement splice for stream af_unix sockets")
Acked-by: Eric Dumazet <edumazet@...gle.com>
Also I would prefer skb_get() being on a separate line, to ease future
understanding of the code.
Thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists