diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-06-18 12:29:16 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-06-18 15:49:37 +0200 |
| commit | 2999c342aa9def638ccce0cef2ffcafa5c63a703 (patch) | |
| tree | 52a09e79e1f01dd46170aff41abe7e70de36a221 | |
| parent | 9de2f4d4ce9de57fd3b17a1ced46f3287c893d8a (diff) | |
| download | upstream-2999c342aa9def638ccce0cef2ffcafa5c63a703.tar.gz upstream-2999c342aa9def638ccce0cef2ffcafa5c63a703.tar.bz2 upstream-2999c342aa9def638ccce0cef2ffcafa5c63a703.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>
| -rw-r--r-- | include/kernel-version.mk | 4 | ||||
| -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 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 6eeb7bb5f4..774e02f34d 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -3,10 +3,10 @@ LINUX_RELEASE?=1 LINUX_VERSION-4.9 = .182 -LINUX_VERSION-4.14 = .126 +LINUX_VERSION-4.14 = .127 LINUX_KERNEL_HASH-4.9.182 = b16e12681a0638368479d73a9b1b8e9407c1ae4b7ae52fdf236d9e5657999695 -LINUX_KERNEL_HASH-4.14.126 = 6a2e89504d8560b132ab743a0206ffce026bff2697b705819421c5f125633970 +LINUX_KERNEL_HASH-4.14.127 = d7464c2379cdee46548ae9f848671f4669d4003af4034f3f738f2f0511ec75b3 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) 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 249cc70cf8..1099ed132c 100644 --- a/target/linux/generic/hack-4.14/902-debloat_proc.patch +++ b/target/linux/generic/hack-4.14/902-debloat_proc.patch @@ -382,7 +382,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) { |