From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:50942 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753911AbdHYBiJ (ORCPT ); Thu, 24 Aug 2017 21:38:09 -0400 Date: Thu, 24 Aug 2017 18:38:14 -0700 From: Greg KH To: David Miller Cc: ncardwell@google.com, edumazet@google.com, ycheng@google.com, stable@vger.kernel.org, stable-commits@vger.kernel.org Subject: Re: Patch "tcp: when rearming RTO, if RTO time is in past then fire RTO ASAP" has been added to the 4.9-stable tree Message-ID: <20170825013814.GA5599@kroah.com> References: <1503621956186175@kroah.com> <20170824.182645.422781978971774143.davem@davemloft.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170824.182645.422781978971774143.davem@davemloft.net> Sender: stable-owner@vger.kernel.org List-ID: On Thu, Aug 24, 2017 at 06:26:45PM -0700, David Miller wrote: > From: Neal Cardwell > Date: Thu, 24 Aug 2017 21:07:56 -0400 > > > On Thu, Aug 24, 2017 at 8:45 PM, wrote: > >> net/ipv4/tcp_input.c | 3 +-- > >> 1 file changed, 1 insertion(+), 2 deletions(-) > >> > >> --- a/net/ipv4/tcp_input.c > >> +++ b/net/ipv4/tcp_input.c > >> @@ -3036,8 +3036,7 @@ void tcp_rearm_rto(struct sock *sk) > >> /* delta may not be positive if the socket is locked > >> * when the retrans timer fires and is rescheduled. > >> */ > >> - if (delta > 0) > >> - rto = delta; > >> + delta = max(delta, 1); > > > > This probably should be: > > > > rto = max(delta, 1); > > > > I think the 4.12-stable backport looks good, but the 3.18, 4.4, and > > 4.9 backports have this issue. > > My bad. > > Greg could you please fix this up for me? Yes, will do. Neal, good catch. greg k-h