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

[Greg KH <gregkh@linuxfoundation.org>]

On Thu, Aug 24, 2017 at 06:26:45PM -0700, David Miller wrote:
> From: Neal Cardwell <ncardwell@google.com>
> Date: Thu, 24 Aug 2017 21:07:56 -0400
> 
> > On Thu, Aug 24, 2017 at 8:45 PM,  <gregkh@linuxfoundation.org> 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