Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp3712955ybv; Mon, 10 Feb 2020 05:10:05 -0800 (PST) X-Google-Smtp-Source: APXvYqzF32om3IzReKZvqvxOqQUnjuPq1FONGo7XUypnvt2MbEYQWbAipXssSznU07KdqkqxNYEz X-Received: by 2002:a54:4117:: with SMTP id l23mr739385oic.140.1581340205751; Mon, 10 Feb 2020 05:10:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581340205; cv=none; d=google.com; s=arc-20160816; b=wfKTD7C0hWG8bGgX8Hul5ih8WgZeFlaYntLYkVdjIQpes3ymxvZk2au2cmWeJ/LX7M Gu18clo1brAdwKlNnXFgH4rCPHZ6XgV11SpNoVIkYv8/mkFTZF8w2sX/w9egQ5/VrDTY GqMizl8ss7GoghHn2GDop071ZsZymbCdY4z4X+mn+Svm69iH+dsJE/KyYTihTlOX1GHo HsLMeTwip4JmSDkLCG5g1mixevvzH7zPrComPk4zlYRvsEHUtKovB+fHRh0MNDancXCk 11ubKklq+EmvPlOokuD7Ia3SKFd7RrAmYyAS8aj8alnHHbfHqpObfVYLAtDFz0D3ubt9 IrDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qaaQPhZErVRH84ZgekWyZJNrgbAW72V/sQc9g3YFPbU=; b=JM91rQqWYxnvkyOBUAFzHjTnyPpp6LuYUknhoo8ePcEwhp4LcgDqmYQAM5UF/nsjZK i3AzpYVvhPQ/rEYJ91tEUED4p/7Fb0m+VZ7qSs3BVmzOiSBUwLUVPc7tmCJ28oJ9vXOH IokM2olBpkOzV2P6YPXxI+9rwvcNN6wBDjELrV4JlyE1BaZZJG4S8HtUIA4w9Ikwnnm7 V4ka/KTAQvoZqhyI8qX0q9VKueotAt9qzU+/3IkBQAiFn59H7O7ttvEjetTGVaWpo67k SaeiDzAqxAaxw9xy2M58gxIc4ZDTKIshWvE0tG+561/JYqeMrNSBkgLSMyJ+c1C95LHy 5OxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0fEozjuc; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q195si136748oic.83.2020.02.10.05.09.54; Mon, 10 Feb 2020 05:10:05 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0fEozjuc; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730904AbgBJNJs (ORCPT + 99 others); Mon, 10 Feb 2020 08:09:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:36236 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729374AbgBJMjP (ORCPT ); Mon, 10 Feb 2020 07:39:15 -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 2CA1424672; Mon, 10 Feb 2020 12:39:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581338355; bh=GayZkbseHYNKhGsx8rndLM7OQf6MYSTd6h98Jhq5lAs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0fEozjucHiwySnN1k8hI8yXo6dc7M7eIQXkNsQ3+0E9Yptl8tbHD8TYdnu/85UeIk vOgl3witDWirF3gozT9TKWsD91RSGlZOU6i0TkW1NvDaqapSN2vDDfac2C/AfOeidz +X2u11yMKHtouQ1hGSbxksHVcc+cA5odp29DNjSk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Dumazet , SeongJae Park , Jakub Kicinski Subject: [PATCH 5.5 011/367] tcp: clear tp->total_retrans in tcp_disconnect() Date: Mon, 10 Feb 2020 04:28:44 -0800 Message-Id: <20200210122424.894603466@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200210122423.695146547@linuxfoundation.org> References: <20200210122423.695146547@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 c13c48c00a6bc1febc73902505bdec0967bd7095 ] total_retrans needs to be cleared in tcp_disconnect(). tcp_disconnect() is rarely used, but it is worth fixing it. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Eric Dumazet Cc: SeongJae Park 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 @@ -2625,6 +2625,7 @@ int tcp_disconnect(struct sock *sk, int tcp_set_ca_state(sk, TCP_CA_Open); tp->is_sack_reneg = 0; tcp_clear_retrans(tp); + tp->total_retrans = 0; inet_csk_delack_init(sk); /* Initialize rcv_mss to TCP_MIN_MSS to avoid division by 0 * issue in __tcp_select_window()