diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-06-18 13:19:59 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-06-18 14:47:53 +0200 |
| commit | aa3f9736ea67200dd840093b848606ced27d388e (patch) | |
| tree | 9ff02f8854dfeda8cb515711442923c0d1863266 /target/linux | |
| parent | 1e3487b3593f8ec9dbfeb0c6865bd8f76ba0824d (diff) | |
| download | upstream-aa3f9736ea67200dd840093b848606ced27d388e.tar.gz upstream-aa3f9736ea67200dd840093b848606ced27d388e.tar.bz2 upstream-aa3f9736ea67200dd840093b848606ced27d388e.zip | |
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 <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux')
5 files changed, 6 insertions, 5 deletions
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 <john@phrozen.org> #include <asm/bootinfo.h> #include <asm/idle.h> -@@ -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 <john@phrozen.org> #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 <john@phrozen.org> { 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 <nbd@nbd.name> @@ -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 <nbd@nbd.name> --- 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) { |