Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Wed, 20 Jan 2021 08:57:30 -0800
From:   Jakub Kicinski <kuba@kernel.org>
To:     Eric Dumazet <edumazet@google.com>,
        Kuniyuki Iwashima <kuni1840@gmail.com>
Cc:     Kuniyuki Iwashima <kuniyu@amazon.co.jp>,
        "David S . Miller" <davem@davemloft.net>,
        Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
        netdev <netdev@vger.kernel.org>,
        LKML <linux-kernel@vger.kernel.org>,
        Benjamin Herrenschmidt <benh@amazon.com>,
        Ricardo Dias <rdias@singlestore.com>
Subject: Re: [PATCH net] tcp: Fix potential use-after-free due to double
 kfree().
Message-ID: <20210120085730.54e74b59@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com>
In-Reply-To: <CANn89iLF4SA_En=sLzEdXByA=m93+EoWKngSZtb4SfeE=8uO9A@mail.gmail.com>
References: <20210118055920.82516-1-kuniyu@amazon.co.jp>
        <20210119171745.6840e3a5@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com>
        <CANn89iLF4SA_En=sLzEdXByA=m93+EoWKngSZtb4SfeE=8uO9A@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Precedence: bulk

On Wed, 20 Jan 2021 14:07:35 +0100 Eric Dumazet wrote:
> On Wed, Jan 20, 2021 at 2:17 AM Jakub Kicinski <kuba@kernel.org> wrote:
> > On Mon, 18 Jan 2021 14:59:20 +0900 Kuniyuki Iwashima wrote:  
> > > Receiving ACK with a valid SYN cookie, cookie_v4_check() allocates struct
> > > request_sock and then can allocate inet_rsk(req)->ireq_opt. After that,
> > > tcp_v4_syn_recv_sock() allocates struct sock and copies ireq_opt to
> > > inet_sk(sk)->inet_opt. Normally, tcp_v4_syn_recv_sock() inserts the full
> > > socket into ehash and sets NULL to ireq_opt. Otherwise,
> > > tcp_v4_syn_recv_sock() has to reset inet_opt by NULL and free the full
> > > socket.
> > >
> > > The commit 01770a1661657 ("tcp: fix race condition when creating child
> > > sockets from syncookies") added a new path, in which more than one cores
> > > create full sockets for the same SYN cookie. Currently, the core which
> > > loses the race frees the full socket without resetting inet_opt, resulting
> > > in that both sock_put() and reqsk_put() call kfree() for the same memory:
> > >
> > >   sock_put
> > >     sk_free
> > >       __sk_free
> > >         sk_destruct
> > >           __sk_destruct
> > >             sk->sk_destruct/inet_sock_destruct
> > >               kfree(rcu_dereference_protected(inet->inet_opt, 1));
> > >
> > >   reqsk_put
> > >     reqsk_free
> > >       __reqsk_free
> > >         req->rsk_ops->destructor/tcp_v4_reqsk_destructor
> > >           kfree(rcu_dereference_protected(inet_rsk(req)->ireq_opt, 1));
> > >
> > > Calling kmalloc() between the double kfree() can lead to use-after-free, so
> > > this patch fixes it by setting NULL to inet_opt before sock_put().
> > >
> > > As a side note, this kind of issue does not happen for IPv6. This is
> > > because tcp_v6_syn_recv_sock() clones both ipv6_opt and pktopts which
> > > correspond to ireq_opt in IPv4.
> > >
> > > Fixes: 01770a166165 ("tcp: fix race condition when creating child sockets from syncookies")
> > > CC: Ricardo Dias <rdias@singlestore.com>
> > > Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.co.jp>
> > > Reviewed-by: Benjamin Herrenschmidt <benh@amazon.com>  
> >
> > Ricardo, Eric, any reason this was written this way?  
> 
> Well, I guess that was a plain bug.
> 
> IPv4 options are not used often I think.

I see.

> Reviewed-by: Eric Dumazet <edumazet@google.com>

Applied, thank you!