diff --git a/patches/kernel/0013-tcp-refine-memory-limit-test-in-tcp_fragment.patch b/patches/kernel/0013-tcp-refine-memory-limit-test-in-tcp_fragment.patch new file mode 100644 index 0000000..0047c9a --- /dev/null +++ b/patches/kernel/0013-tcp-refine-memory-limit-test-in-tcp_fragment.patch @@ -0,0 +1,42 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Eric Dumazet +Date: Fri, 21 Jun 2019 06:09:55 -0700 +Subject: [PATCH] tcp: refine memory limit test in tcp_fragment() + +tcp_fragment() might be called for skbs in the write queue. + +Memory limits might have been exceeded because tcp_sendmsg() only +checks limits at full skb (64KB) boundaries. + +Therefore, we need to make sure tcp_fragment() wont punish applications +that might have setup very low SO_SNDBUF values. + +Fixes: f070ef2ac667 ("tcp: tcp_fragment() should apply sane memory limits") +Signed-off-by: Eric Dumazet +Reported-by: Christoph Paasch +Tested-by: Christoph Paasch +Signed-off-by: David S. Miller + +BugLink: https://bugs.launchpad.net/bugs/1831638 +CVE-2019-11478 + +Signed-off-by: Kleber Sacilotto de Souza +Signed-off-by: Thomas Lamprecht +--- + net/ipv4/tcp_output.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c +index e471ec48dcbc..de76eb94b4d2 100644 +--- a/net/ipv4/tcp_output.c ++++ b/net/ipv4/tcp_output.c +@@ -1321,7 +1321,8 @@ int tcp_fragment(struct sock *sk, enum tcp_queue tcp_queue, + if (nsize < 0) + nsize = 0; + +- if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf)) { ++ if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf && ++ tcp_queue != TCP_FRAG_IN_WRITE_QUEUE)) { + NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPWQUEUETOOBIG); + return -ENOMEM; + }