Skip to content
Permalink
Browse files

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: cf65262 ("kernel: bump 4.19 to 4.19.51")
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
  • Loading branch information...
xback committed Jun 18, 2019
1 parent 1e3487b commit aa3f9736ea67200dd840093b848606ced27d388e
@@ -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)))))))
@@ -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)
{

0 comments on commit aa3f973

Please sign in to comment.
You can’t perform that action at this time.