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;
MIME-Version: 1.0
References: <20211020232447.9548-1-jmaxwell37@gmail.com>
In-Reply-To: <20211020232447.9548-1-jmaxwell37@gmail.com>
From:   Eric Dumazet <edumazet@google.com>
Date:   Wed, 20 Oct 2021 18:10:54 -0700
Message-ID: <CANn89i+e3n6RveyuOhdfnQdJESdFvjgkgMjXSHCyuTRDB-E8Bw@mail.gmail.com>
Subject: Re: [net-next] tcp: don't free a FIN sk_buff in tcp_remove_empty_skb()
To:     Jon Maxwell <jmaxwell37@gmail.com>
Cc:     David Miller <davem@davemloft.net>,
        Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
        David Ahern <dsahern@kernel.org>,
        Jakub Kicinski <kuba@kernel.org>,
        netdev <netdev@vger.kernel.org>,
        LKML <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Wed, Oct 20, 2021 at 4:25 PM Jon Maxwell <jmaxwell37@gmail.com> wrote:
>
> A customer reported sockets stuck in the CLOSING state. A Vmcore revealed=
 that
> the write_queue was not empty as determined by tcp_write_queue_empty() bu=
t the
> sk_buff containing the FIN flag had been freed and the socket was zombied=
 in
> that state. Corresponding pcaps show no FIN from the Linux kernel on the =
wire.
>
> Some instrumentation was added to the kernel and it was found that there =
is a
> timing window where tcp_sendmsg() can run after tcp_send_fin().
>
> tcp_sendmsg() will hit an error, for example:
>
> 1269 =E2=96=B9       if (sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN))=
=E2=86=A9
> 1270 =E2=96=B9       =E2=96=B9       goto do_error;=E2=86=A9
>
> tcp_remove_empty_skb() will then free the FIN sk_buff as "skb->len =3D=3D=
 0". The
> TCP socket is now wedged in the FIN-WAIT-1 state because the FIN is never=
 sent.
>
> If the other side sends a FIN packet the socket will transition to CLOSIN=
G and
> remain that way until the system is rebooted.
>
> Fix this by checking for the FIN flag in the sk_buff and don't free it if=
 that
> is the case. Testing confirmed that fixed the issue.
>
> Fixes: fdfc5c8594c2 ("tcp: remove empty skb from write queue in error cas=
es")
> Signed-off-by: Jon Maxwell <jmaxwell37@gmail.com>
> ---
>  net/ipv4/tcp.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
> index c2d9830136d2..d2b06d8f0c37 100644
> --- a/net/ipv4/tcp.c
> +++ b/net/ipv4/tcp.c
> @@ -938,7 +938,7 @@ int tcp_send_mss(struct sock *sk, int *size_goal, int=
 flags)
>   */
>  void tcp_remove_empty_skb(struct sock *sk, struct sk_buff *skb)
>  {
> -       if (skb && !skb->len) {
> +       if (skb && !skb->len && !TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN)=
 {
>                 tcp_unlink_write_queue(skb, sk);
>                 if (tcp_write_queue_empty(sk))
>                         tcp_chrono_stop(sk, TCP_CHRONO_BUSY);
>

Very nice catch !

The FIN flag is a really special case here.

What we need is to make sure the skb is 'empty' .

What about using a single condition ?

if (skb && TCP_SKB_CB(skb)->seq =3D=3D TCP_SKB_CB(skb)->end_seq)