stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg KH <gregkh@linuxfoundation.org>
To: edumazet@google.com, aprout@ll.mit.edu, cpaasch@apple.com,
	davem@davemloft.net, jonathan.lemon@gmail.com, jtl@netflix.com,
	mkubecek@suse.cz, ncardwell@google.com, ycheng@google.com
Cc: stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] tcp: be more careful in tcp_fragment()" failed to apply to 4.14-stable tree
Date: Fri, 26 Jul 2019 14:45:17 +0200	[thread overview]
Message-ID: <20190726124517.GA8301@kroah.com> (raw)
In-Reply-To: <1564144694159130@kroah.com>

On Fri, Jul 26, 2019 at 02:38:14PM +0200, gregkh@linuxfoundation.org wrote:
> 
> The patch below does not apply to the 4.14-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@vger.kernel.org>.
> 
> thanks,
> 
> greg k-h
> 
> ------------------ original commit in Linus's tree ------------------
> 
> >From b617158dc096709d8600c53b6052144d12b89fab Mon Sep 17 00:00:00 2001
> From: Eric Dumazet <edumazet@google.com>
> Date: Fri, 19 Jul 2019 11:52:33 -0700
> Subject: [PATCH] tcp: be more careful in tcp_fragment()
> 
> Some applications set tiny SO_SNDBUF values and expect
> TCP to just work. Recent patches to address CVE-2019-11478
> broke them in case of losses, since retransmits might
> be prevented.
> 
> We should allow these flows to make progress.
> 
> This patch allows the first and last skb in retransmit queue
> to be split even if memory limits are hit.
> 
> It also adds the some room due to the fact that tcp_sendmsg()
> and tcp_sendpage() might overshoot sk_wmem_queued by about one full
> TSO skb (64KB size). Note this allowance was already present
> in stable backports for kernels < 4.15
> 
> Note for < 4.15 backports :
>  tcp_rtx_queue_tail() will probably look like :
> 
> static inline struct sk_buff *tcp_rtx_queue_tail(const struct sock *sk)
> {
> 	struct sk_buff *skb = tcp_send_head(sk);
> 
> 	return skb ? tcp_write_queue_prev(sk, skb) : tcp_write_queue_tail(sk);
> }


Note, I tried the above, but still ran into problems a 4.14 does not
have tcp_rtx_queue_head() and while I could guess as to what it would be
(tcp_sent_head()?), I figured it would be safer to ask for a backport :)

thanks,

greg k-h

  reply	other threads:[~2019-07-26 12:45 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-26 12:38 FAILED: patch "[PATCH] tcp: be more careful in tcp_fragment()" failed to apply to 4.14-stable tree gregkh
2019-07-26 12:45 ` Greg KH [this message]
2019-07-26 14:39   ` Eric Dumazet
2019-07-26 14:54     ` Greg KH
2019-08-06 15:09     ` [PATCH] tcp: be more careful in tcp_fragment() Matthieu Baerts
2019-08-06 15:25       ` Eric Dumazet
2019-08-06 22:10         ` Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190726124517.GA8301@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=aprout@ll.mit.edu \
    --cc=cpaasch@apple.com \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=jonathan.lemon@gmail.com \
    --cc=jtl@netflix.com \
    --cc=mkubecek@suse.cz \
    --cc=ncardwell@google.com \
    --cc=stable@vger.kernel.org \
    --cc=ycheng@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).