From aa3f9736ea67200dd840093b848606ced27d388e Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Tue, 18 Jun 2019 13:19:59 +0200 Subject: [PATCH] kernel: bump 4.19 to 4.19.52 Refreshed all patches. Fixes: - CVE-2019-11479 - CVE-2019-11478 - CVE-2019-11477 Also fix a malformed patch issue caught during refresh. It was caused by removing a whitespace without altering the index values in a patch which alters a patch. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Fixes: cf6526249298 ("kernel: bump 4.19 to 4.19.51") Signed-off-by: Koen Vandeputte --- include/kernel-version.mk | 4 ++-- .../patches-4.19/0027-MIPS-ath79-drop-legacy-IRQ-code.patch | 2 +- .../ath79/patches-4.19/0028-MIPS-ath79-drop-machfiles.patch | 4 ++-- .../linux/ath79/patches-4.19/910-unaligned_access_hacks.patch | 2 +- ...netfilter-nf_flow_table-fix-offloaded-connection-tim.patch | 1 + target/linux/generic/hack-4.19/902-debloat_proc.patch | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 778b599dc4..a3fe16bf92 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,11 +8,11 @@ endif LINUX_VERSION-4.9 = .182 LINUX_VERSION-4.14 = .127 -LINUX_VERSION-4.19 = .51 +LINUX_VERSION-4.19 = .52 LINUX_KERNEL_HASH-4.9.182 = b16e12681a0638368479d73a9b1b8e9407c1ae4b7ae52fdf236d9e5657999695 LINUX_KERNEL_HASH-4.14.127 = d7464c2379cdee46548ae9f848671f4669d4003af4034f3f738f2f0511ec75b3 -LINUX_KERNEL_HASH-4.19.51 = 7afa920d776f8ca3fc3ced5026cc02c5ccc960c58314050982c307589b5a8d70 +LINUX_KERNEL_HASH-4.19.52 = 266ee655620c3689ae94761970d6827fffc919760caf815427ad22730ba4381e 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/ath79/patches-4.19/0027-MIPS-ath79-drop-legacy-IRQ-code.patch b/target/linux/ath79/patches-4.19/0027-MIPS-ath79-drop-legacy-IRQ-code.patch index 79f003d2ea..6586f08431 100644 --- a/target/linux/ath79/patches-4.19/0027-MIPS-ath79-drop-legacy-IRQ-code.patch +++ b/target/linux/ath79/patches-4.19/0027-MIPS-ath79-drop-legacy-IRQ-code.patch @@ -208,7 +208,7 @@ Signed-off-by: John Crispin #include #include -@@ -311,6 +312,11 @@ void __init plat_time_init(void) +@@ -305,6 +306,11 @@ void __init plat_time_init(void) mips_hpt_frequency = cpu_clk_rate / 2; } diff --git a/target/linux/ath79/patches-4.19/0028-MIPS-ath79-drop-machfiles.patch b/target/linux/ath79/patches-4.19/0028-MIPS-ath79-drop-machfiles.patch index 0515b206b0..1901e6e437 100644 --- a/target/linux/ath79/patches-4.19/0028-MIPS-ath79-drop-machfiles.patch +++ b/target/linux/ath79/patches-4.19/0028-MIPS-ath79-drop-machfiles.patch @@ -944,7 +944,7 @@ Signed-off-by: John Crispin #define ATH79_SYS_TYPE_LEN 64 -@@ -236,25 +235,21 @@ void __init plat_mem_setup(void) +@@ -230,25 +229,21 @@ void __init plat_mem_setup(void) else if (fw_passed_dtb) __dt_setup_arch((void *)KSEG0ADDR(fw_passed_dtb)); @@ -979,7 +979,7 @@ Signed-off-by: John Crispin { struct device_node *np; struct clk *clk; -@@ -284,66 +279,12 @@ static void __init ath79_of_plat_time_in +@@ -278,66 +273,12 @@ static void __init ath79_of_plat_time_in clk_put(clk); } diff --git a/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch index f765a08c98..bb7f847e1b 100644 --- a/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch @@ -728,7 +728,7 @@ EXPORT_SYMBOL(xfrm_parse_spi); --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -3898,14 +3898,16 @@ static bool tcp_parse_aligned_timestamp( +@@ -3912,14 +3912,16 @@ static bool tcp_parse_aligned_timestamp( { const __be32 *ptr = (const __be32 *)(th + 1); diff --git a/target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch b/target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch index 69f0a5fd24..07ef724094 100644 --- a/target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch +++ b/target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch @@ -82,6 +82,7 @@ Signed-off-by: Felix Fietkau @@ -203,6 +221,7 @@ int flow_offload_add(struct nf_flowtable return err; } + + nf_ct_offload_timeout(flow); flow->timeout = (u32)jiffies; return 0; diff --git a/target/linux/generic/hack-4.19/902-debloat_proc.patch b/target/linux/generic/hack-4.19/902-debloat_proc.patch index 89d9cf0893..ef272f171c 100644 --- a/target/linux/generic/hack-4.19/902-debloat_proc.patch +++ b/target/linux/generic/hack-4.19/902-debloat_proc.patch @@ -382,7 +382,7 @@ Signed-off-by: Felix Fietkau --- a/net/ipv4/proc.c +++ b/net/ipv4/proc.c -@@ -523,5 +523,8 @@ static __net_initdata struct pernet_oper +@@ -524,5 +524,8 @@ static __net_initdata struct pernet_oper int __init ip_misc_proc_init(void) { -- 2.30.2