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,URIBL_BLOCKED,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 6E93AC2BA83 for ; Thu, 13 Feb 2020 16:07:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3BA3A20656 for ; Thu, 13 Feb 2020 16:07:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581610067; bh=1FyZM8Sm13hqaDBtOaWeU//3WAyzW/q97liyi4uvJm0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=VjGRv435Fvxje6YxI1l9Enbj/YCgzhCp26ZVUHZ7GqvBuurRsXflm9oY+E1AFBnQ/ Eq73LSsQRkzi2d7SQrvaKu4IiUUlNGcTZ92SbrSwHjstdau9aYMPrC47IbSlDIUPLi nFamB1ZTSWvI7MjngaNBMaW3Opte7qLpGEu+cwys= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730277AbgBMQHq (ORCPT ); Thu, 13 Feb 2020 11:07:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:34212 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728335AbgBMPXS (ORCPT ); Thu, 13 Feb 2020 10:23:18 -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 11729246B5; Thu, 13 Feb 2020 15:23:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581607398; bh=1FyZM8Sm13hqaDBtOaWeU//3WAyzW/q97liyi4uvJm0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DNm6cuBEfO4Fwl8y+kb7yRMSIR2Mqk49YjcukQlZgoSD4VG6KtZxQLRiJ0iiGpx7Q H+cxLas2ok3uPP3M7pGhboxpn8ZqGXrjy+CchFws44Ob/arnzd7THBaQ9KIqGRuTWv RZC0uGpndj/C+HxFsX04yRnYYq46tETUYLtxDCVA= 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 4.9 012/116] tcp: clear tp->delivered in tcp_disconnect() Date: Thu, 13 Feb 2020 07:19:16 -0800 Message-Id: <20200213151847.537979384@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200213151842.259660170@linuxfoundation.org> References: <20200213151842.259660170@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 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 @@ -2298,6 +2298,7 @@ int tcp_disconnect(struct sock *sk, int tp->snd_ssthresh = TCP_INFINITE_SSTHRESH; tp->snd_cwnd_cnt = 0; tp->window_clamp = 0; + tp->delivered = 0; tcp_set_ca_state(sk, TCP_CA_Open); tp->is_sack_reneg = 0; tcp_clear_retrans(tp);