From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C6F4C352A4 for ; Mon, 10 Feb 2020 13:27:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4C42D208C4 for ; Mon, 10 Feb 2020 13:27:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581341230; bh=N5y7pKX80UIjRezLrQE5/bhaJl9jZEsKZ2aCw4TLKh4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JP2uq+ItJ7O3zRCDLqrx7GoGQDlKL8g/4zDZG+eQ5Q2nnLxXupLJvI7FTISijxQBF 4t+ltsUBi+GkBMzHZX2EnWmaUbObn/svSgw9BfyPDwaGzxQNbwWI95iE9OpDBgUfmp +NUB3RpBbN5t0f9NTmjU05wNc3sFwb1I7PmnuQH4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728473AbgBJN06 (ORCPT ); Mon, 10 Feb 2020 08:26:58 -0500 Received: from mail.kernel.org ([198.145.29.99]:56590 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728466AbgBJMgk (ORCPT ); Mon, 10 Feb 2020 07:36:40 -0500 Received: from localhost (unknown [209.37.97.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 074DF20873; Mon, 10 Feb 2020 12:36:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581338200; bh=N5y7pKX80UIjRezLrQE5/bhaJl9jZEsKZ2aCw4TLKh4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U+1NmE3m6lVwrSJJ3PcIj7LghaXJcFmdyOQxe7NAJ1mQZO1rHLoOH6CwGQAcD9Dij u4At9YdCKAgt3wmBddtLQP8EnVVqe/5A7V24CujrZDTUkxs5wnVFGPWoMMHeeHRtm0 EoWqvHxNdeIS2QDkd/j3iBSHqe3bymBlH5U6uYPI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Dumazet , Yuchung Cheng , Neal Cardwell , Soheil Hassas Yeganeh , Jakub Kicinski Subject: [PATCH 5.4 015/309] tcp: clear tp->delivered in tcp_disconnect() Date: Mon, 10 Feb 2020 04:29:31 -0800 Message-Id: <20200210122407.475689871@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200210122406.106356946@linuxfoundation.org> References: <20200210122406.106356946@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Eric Dumazet [ Upstream commit 2fbdd56251b5c62f96589f39eded277260de7267 ] tp->delivered needs to be cleared in tcp_disconnect(). tcp_disconnect() is rarely used, but it is worth fixing it. Fixes: ddf1af6fa00e ("tcp: new delivery accounting") Signed-off-by: Eric Dumazet Cc: Yuchung Cheng Cc: Neal Cardwell Acked-by: Yuchung Cheng Acked-by: Neal Cardwell Acked-by: Soheil Hassas Yeganeh Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- net/ipv4/tcp.c | 1 + 1 file changed, 1 insertion(+) --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -2618,6 +2618,7 @@ int tcp_disconnect(struct sock *sk, int tp->snd_cwnd = TCP_INIT_CWND; tp->snd_cwnd_cnt = 0; tp->window_clamp = 0; + tp->delivered = 0; tp->delivered_ce = 0; tcp_set_ca_state(sk, TCP_CA_Open); tp->is_sack_reneg = 0;