projects
/
openwrt
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9de2f4d
)
kernel: bump 4.14 to 4.14.127
author
Koen Vandeputte
<koen.vandeputte@ncentric.com>
Tue, 18 Jun 2019 10:29:16 +0000
(12:29 +0200)
committer
Koen Vandeputte
<koen.vandeputte@ncentric.com>
Tue, 18 Jun 2019 13:49:37 +0000
(15:49 +0200)
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>
include/kernel-version.mk
patch
|
blob
|
history
target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch
patch
|
blob
|
history
target/linux/generic/hack-4.14/902-debloat_proc.patch
patch
|
blob
|
history
diff --git
a/include/kernel-version.mk
b/include/kernel-version.mk
index 6eeb7bb5f468c5901d858201e7fe65c777570d57..774e02f34df9d75a9ff1cbe59030fe943956b5c5 100644
(file)
--- a/
include/kernel-version.mk
+++ b/
include/kernel-version.mk
@@
-3,10
+3,10
@@
LINUX_RELEASE?=1
LINUX_VERSION-4.9 = .182
LINUX_RELEASE?=1
LINUX_VERSION-4.9 = .182
-LINUX_VERSION-4.14 = .12
6
+LINUX_VERSION-4.14 = .12
7
LINUX_KERNEL_HASH-4.9.182 = b16e12681a0638368479d73a9b1b8e9407c1ae4b7ae52fdf236d9e5657999695
LINUX_KERNEL_HASH-4.9.182 = b16e12681a0638368479d73a9b1b8e9407c1ae4b7ae52fdf236d9e5657999695
-LINUX_KERNEL_HASH-4.14.12
6 = 6a2e89504d8560b132ab743a0206ffce026bff2697b705819421c5f125633970
+LINUX_KERNEL_HASH-4.14.12
7 = d7464c2379cdee46548ae9f848671f4669d4003af4034f3f738f2f0511ec75b3
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
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 915a7f05d16315610eb7fc0fddad58e5c73c20c4..86d101be260929a2698689ef4e65f4b09a77702a 100644
(file)
--- 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
* Before updating sk_refcnt, we must commit prior changes to memory
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
-@@ -168
3,7 +1683
,7 @@ u32 tcp_tso_autosize(const struct sock *
+@@ -168
7,7 +1687
,7 @@ u32 tcp_tso_autosize(const struct sock *
{
u32 bytes, segs;
{
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,
sk->sk_gso_max_size - 1 - MAX_TCP_HEADER);
/* Goal is to send at least one packet per ms,
-@@ -220
0,7 +2200
,7 @@ static bool tcp_small_queue_check(struct
+@@ -220
4,7 +2204
,7 @@ static bool tcp_small_queue_check(struct
{
unsigned int limit;
{
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 249cc70cf835a1a0eae653e7687d789f661b522c..1099ed132cd5715f8a596ea89c8ba9475c19dae2 100644
(file)
--- 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
--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
-@@ -55
8,6 +558
,9 @@ static __net_initdata struct pernet_oper
+@@ -55
9,6 +559
,9 @@ static __net_initdata struct pernet_oper
int __init ip_misc_proc_init(void)
{
int __init ip_misc_proc_init(void)
{