From patchwork Thu Feb 13 15:18:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 231321 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, URIBL_BLOCKED, 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 406D9C3B189 for ; Thu, 13 Feb 2020 16:00:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 18D612073C for ; Thu, 13 Feb 2020 16:00:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581609646; bh=zj0L/O4bKO6W4FzZ9V7mOoFoXZc71mjj81b4DP/Dsds=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jMxzfjONboYWkAsS7kOWEgsF71UtJOiwgaCaNApGw6eivZp/5tCR7cRhkOIWYNotH ye8cZvqThfpAsQ2tjqKYVMyWCiXQFvJxc6i13Fgw4VqosOOAiLbAhLMA7EIaycXvE/ 68S8XnlKCHr/+nWggPlotdfVivgU9srBLV45YXmA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730135AbgBMQAe (ORCPT ); Thu, 13 Feb 2020 11:00:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:39060 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728767AbgBMPYp (ORCPT ); Thu, 13 Feb 2020 10:24:45 -0500 Received: from localhost (unknown [104.132.1.104]) (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 4D90420848; Thu, 13 Feb 2020 15:24:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581607485; bh=zj0L/O4bKO6W4FzZ9V7mOoFoXZc71mjj81b4DP/Dsds=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mCpXIpFdxaiaQAh4gSq51cIpQq2tBMGUgOEfqgDmCHtiSO195XpleDrBmZJnzRAXP pD48usF5gAPBB9anqYGVHTXOYuSBYHOhOsD7Nhj73679daUuhKnNfp7+EobprGmo+Q CvxVcD2rO3aJrzVtx6VQ7xL5XR3P+a4iMxYqXqF4= 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 4.14 015/173] tcp: clear tp->segs_{in|out} in tcp_disconnect() Date: Thu, 13 Feb 2020 07:18:38 -0800 Message-Id: <20200213151936.687879775@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200213151931.677980430@linuxfoundation.org> References: <20200213151931.677980430@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 @@ -2379,6 +2379,8 @@ int tcp_disconnect(struct sock *sk, int dst_release(sk->sk_rx_dst); sk->sk_rx_dst = NULL; tcp_saved_syn_free(tp); + tp->segs_in = 0; + tp->segs_out = 0; tp->bytes_acked = 0; tp->bytes_received = 0; tp->data_segs_in = 0;