diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-06-18 12:37:27 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-06-18 14:47:53 +0200 |
commit | 1e3487b3593f8ec9dbfeb0c6865bd8f76ba0824d (patch) | |
tree | 8cc6d49ebd0bd0c8cb7d6de57db3693032d43a64 /target/linux/generic | |
parent | bcd17bdbe5f4460bce055b4ac692e62e193847a3 (diff) | |
download | upstream-1e3487b3593f8ec9dbfeb0c6865bd8f76ba0824d.tar.gz upstream-1e3487b3593f8ec9dbfeb0c6865bd8f76ba0824d.tar.bz2 upstream-1e3487b3593f8ec9dbfeb0c6865bd8f76ba0824d.zip |
kernel: bump 4.14 to 4.14.127
Refreshed all patches.
Fixes:
- CVE-2019-11479
- CVE-2019-11478
- CVE-2019-11477
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic')
-rw-r--r-- | target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch | 4 | ||||
-rw-r--r-- | target/linux/generic/hack-4.14/902-debloat_proc.patch | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch b/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch index 915a7f05d1..86d101be26 100644 --- a/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch +++ b/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch @@ -65,7 +65,7 @@ Cc: Kir Kolyshkin <kir@openvz.org> * Before updating sk_refcnt, we must commit prior changes to memory --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c -@@ -1683,7 +1683,7 @@ u32 tcp_tso_autosize(const struct sock * +@@ -1687,7 +1687,7 @@ u32 tcp_tso_autosize(const struct sock * { u32 bytes, segs; @@ -74,7 +74,7 @@ Cc: Kir Kolyshkin <kir@openvz.org> sk->sk_gso_max_size - 1 - MAX_TCP_HEADER); /* Goal is to send at least one packet per ms, -@@ -2200,7 +2200,7 @@ static bool tcp_small_queue_check(struct +@@ -2204,7 +2204,7 @@ static bool tcp_small_queue_check(struct { unsigned int limit; diff --git a/target/linux/generic/hack-4.14/902-debloat_proc.patch b/target/linux/generic/hack-4.14/902-debloat_proc.patch index 7a76f671b7..8e7d6ac9ff 100644 --- a/target/linux/generic/hack-4.14/902-debloat_proc.patch +++ b/target/linux/generic/hack-4.14/902-debloat_proc.patch @@ -381,7 +381,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/net/ipv4/proc.c +++ b/net/ipv4/proc.c -@@ -558,6 +558,9 @@ static __net_initdata struct pernet_oper +@@ -559,6 +559,9 @@ static __net_initdata struct pernet_oper int __init ip_misc_proc_init(void) { |