mirror of https://github.com/hak5/openwrt.git
kernel: bump 4.14 to 4.14.127
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>openwrt-19.07
parent
c26420b914
commit
17fc5375f0
|
@ -7,11 +7,11 @@ ifdef CONFIG_TESTING_KERNEL
|
|||
endif
|
||||
|
||||
LINUX_VERSION-4.9 = .180
|
||||
LINUX_VERSION-4.14 = .126
|
||||
LINUX_VERSION-4.14 = .127
|
||||
LINUX_VERSION-4.19 = .48
|
||||
|
||||
LINUX_KERNEL_HASH-4.9.180 = d25a490d62a3e96a587333e163862585eac4086fc8d4893b4ec1711e7d387c5f
|
||||
LINUX_KERNEL_HASH-4.14.126 = 6a2e89504d8560b132ab743a0206ffce026bff2697b705819421c5f125633970
|
||||
LINUX_KERNEL_HASH-4.14.127 = d7464c2379cdee46548ae9f848671f4669d4003af4034f3f738f2f0511ec75b3
|
||||
LINUX_KERNEL_HASH-4.19.48 = 01d0db4f10cc8e384241a605e29413e32c442aa6853c116877538b07c16893fa
|
||||
|
||||
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- a/arch/mips/ath79/setup.c
|
||||
+++ b/arch/mips/ath79/setup.c
|
||||
@@ -283,6 +283,8 @@ void __init plat_time_init(void)
|
||||
@@ -277,6 +277,8 @@ void __init plat_time_init(void)
|
||||
mips_hpt_frequency = cpu_clk_rate / 2;
|
||||
}
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
--- a/arch/mips/ath79/setup.c
|
||||
+++ b/arch/mips/ath79/setup.c
|
||||
@@ -196,16 +196,20 @@ unsigned int get_c0_compare_int(void)
|
||||
@@ -190,16 +190,20 @@ unsigned int get_c0_compare_int(void)
|
||||
|
||||
void __init plat_mem_setup(void)
|
||||
{
|
||||
|
@ -31,7 +31,7 @@
|
|||
|
||||
if (mips_machtype != ATH79_MACH_GENERIC_OF) {
|
||||
ath79_reset_base = ioremap_nocache(AR71XX_RESET_BASE,
|
||||
@@ -301,17 +305,21 @@ static int __init ath79_setup(void)
|
||||
@@ -295,17 +299,21 @@ static int __init ath79_setup(void)
|
||||
|
||||
arch_initcall(ath79_setup);
|
||||
|
||||
|
|
|
@ -757,7 +757,7 @@
|
|||
EXPORT_SYMBOL(xfrm_parse_spi);
|
||||
--- a/net/ipv4/tcp_input.c
|
||||
+++ b/net/ipv4/tcp_input.c
|
||||
@@ -3858,14 +3858,16 @@ static bool tcp_parse_aligned_timestamp(
|
||||
@@ -3874,14 +3874,16 @@ static bool tcp_parse_aligned_timestamp(
|
||||
{
|
||||
const __be32 *ptr = (const __be32 *)(th + 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;
|
||||
}
|
||||
|
||||
|
|
|
@ -938,7 +938,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));
|
||||
|
||||
|
@ -973,7 +973,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);
|
||||
}
|
||||
|
||||
|
|
|
@ -737,7 +737,7 @@
|
|||
EXPORT_SYMBOL(xfrm_parse_spi);
|
||||
--- a/net/ipv4/tcp_input.c
|
||||
+++ b/net/ipv4/tcp_input.c
|
||||
@@ -3858,14 +3858,16 @@ static bool tcp_parse_aligned_timestamp(
|
||||
@@ -3874,14 +3874,16 @@ static bool tcp_parse_aligned_timestamp(
|
||||
{
|
||||
const __be32 *ptr = (const __be32 *)(th + 1);
|
||||
|
||||
|
|
|
@ -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
|
||||
@@ -1683,7 +1683,7 @@ u32 tcp_tso_autosize(const struct sock *
|
||||
@@ -1687,7 +1687,7 @@ u32 tcp_tso_autosize(const struct sock *
|
||||
{
|
||||
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,
|
||||
@@ -2200,7 +2200,7 @@ static bool tcp_small_queue_check(struct
|
||||
@@ -2204,7 +2204,7 @@ static bool tcp_small_queue_check(struct
|
||||
{
|
||||
unsigned int limit;
|
||||
|
||||
|
|
|
@ -381,7 +381,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||
|
||||
--- a/net/ipv4/proc.c
|
||||
+++ b/net/ipv4/proc.c
|
||||
@@ -558,6 +558,9 @@ static __net_initdata struct pernet_oper
|
||||
@@ -559,6 +559,9 @@ static __net_initdata struct pernet_oper
|
||||
|
||||
int __init ip_misc_proc_init(void)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue