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=ham 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 EE872C352A3 for ; Mon, 10 Feb 2020 13:26:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C893F208C4 for ; Mon, 10 Feb 2020 13:26:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581341216; bh=LTkYHbx/ejkEJkCfHHhialRWrg/S/rzsmTOtS+vvSUU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CR1FUcJDM+C/3GnSZhh36I6kGWDZk88yqKAmQcOuUnIyOfaUWKXEllHgQBPoBUodm /IuBHYNh0fhbKwlG7kSPVLFH+EvCgSf2l3eiL8cGCPrF5WPvTJzi5AzV6Upqi1TRJd PL48hAqUkuKxNZX6Sb4b4hq78GniDc+TEC7nna7o= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728552AbgBJN04 (ORCPT ); Mon, 10 Feb 2020 08:26:56 -0500 Received: from mail.kernel.org ([198.145.29.99]:56634 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728473AbgBJMgl (ORCPT ); Mon, 10 Feb 2020 07:36:41 -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 05AE820733; 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=1581338201; bh=LTkYHbx/ejkEJkCfHHhialRWrg/S/rzsmTOtS+vvSUU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GNIqD0Qs8vwAj34X4S0EUUuQvmqF+ZvSczjRls5OY5vQSqCSf2jHszoxo692RL4dx pGBOdLAJhwSUGYvS58fDeef4EZjVda3DLcwYDhbnfwJ2QXrD7ASW5wZmwFAdMS0a0F Ah+zjsiF/q1cmlLgazETQI7UBuNL/Yiw64EhYSn4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Dumazet , Marcelo Ricardo Leitner , Yuchung Cheng , Neal Cardwell , Jakub Kicinski Subject: [PATCH 5.4 017/309] tcp: clear tp->segs_{in|out} in tcp_disconnect() Date: Mon, 10 Feb 2020 04:29:33 -0800 Message-Id: <20200210122407.647977825@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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Eric Dumazet [ Upstream commit 784f8344de750a41344f4bbbebb8507a730fc99c ] tp->segs_in and tp->segs_out need to be cleared in tcp_disconnect(). tcp_disconnect() is rarely used, but it is worth fixing it. Fixes: 2efd055c53c0 ("tcp: add tcpi_segs_in and tcpi_segs_out to tcp_info") Signed-off-by: Eric Dumazet Cc: Marcelo Ricardo Leitner Cc: Yuchung Cheng Cc: Neal Cardwell Acked-by: Neal Cardwell Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- net/ipv4/tcp.c | 2 ++ 1 file changed, 2 insertions(+) --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -2635,6 +2635,8 @@ int tcp_disconnect(struct sock *sk, int sk->sk_rx_dst = NULL; tcp_saved_syn_free(tp); tp->compressed_ack = 0; + tp->segs_in = 0; + tp->segs_out = 0; tp->bytes_sent = 0; tp->bytes_acked = 0; tp->bytes_received = 0;