From bcd17bdbe5f4460bce055b4ac692e62e193847a3 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Tue, 18 Jun 2019 11:49:03 +0200 Subject: kernel: bump 4.9 to 4.9.182 Refreshed all patches. Fixes: - CVE-2019-11479 - CVE-2019-11478 - CVE-2019-11477 Compile-tested on: none Runtime-tested on: none Signed-off-by: Koen Vandeputte --- .../024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'target/linux/generic/backport-4.9/024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch') diff --git a/target/linux/generic/backport-4.9/024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch b/target/linux/generic/backport-4.9/024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch index 0a5b9ead9d..b30b7cea90 100644 --- a/target/linux/generic/backport-4.9/024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch +++ b/target/linux/generic/backport-4.9/024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch @@ -114,7 +114,7 @@ Signed-off-by: David S. Miller if (nval != oval) continue; -@@ -2136,7 +2136,7 @@ static bool tcp_small_queue_check(struct +@@ -2140,7 +2140,7 @@ static bool tcp_small_queue_check(struct skb->prev == sk->sk_write_queue.next) return false; @@ -123,7 +123,7 @@ Signed-off-by: David S. Miller /* It is possible TX completion already happened * before we set TSQ_THROTTLED, so we must * test again the condition. -@@ -2234,8 +2234,8 @@ static bool tcp_write_xmit(struct sock * +@@ -2238,8 +2238,8 @@ static bool tcp_write_xmit(struct sock * unlikely(tso_fragment(sk, skb, limit, mss_now, gfp))) break; @@ -134,7 +134,7 @@ Signed-off-by: David S. Miller if (tcp_small_queue_check(sk, skb, 0)) break; -@@ -3546,8 +3546,6 @@ void __tcp_send_ack(struct sock *sk, u32 +@@ -3550,8 +3550,6 @@ void __tcp_send_ack(struct sock *sk, u32 /* We do not want pure acks influencing TCP Small Queues or fq/pacing * too much. * SKB_TRUESIZE(max(1 .. 66, MAX_TCP_HEADER)) is unfortunately ~784 @@ -145,7 +145,7 @@ Signed-off-by: David S. Miller --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c -@@ -326,7 +326,7 @@ static void tcp_delack_timer(unsigned lo +@@ -327,7 +327,7 @@ static void tcp_delack_timer(unsigned lo inet_csk(sk)->icsk_ack.blocked = 1; __NET_INC_STATS(sock_net(sk), LINUX_MIB_DELAYEDACKLOCKED); /* deleguate our work to tcp_release_cb() */ @@ -154,7 +154,7 @@ Signed-off-by: David S. Miller sock_hold(sk); } bh_unlock_sock(sk); -@@ -609,7 +609,7 @@ static void tcp_write_timer(unsigned lon +@@ -610,7 +610,7 @@ static void tcp_write_timer(unsigned lon tcp_write_timer_handler(sk); } else { /* delegate our work to tcp_release_cb() */ -- cgit v1.2.3