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: cf65262492 ("kernel: bump 4.19 to 4.19.51")
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user