From b6c9d2bab09068776b146962e23f1ce7f5f75f07 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Fri, 21 Feb 2020 15:09:00 +0100 Subject: kernel: bump 4.19 to 4.19.105 Refreshed all patches. Fixes: - CVE-2013-1798 - CVE-2019-3016 Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte --- .../210-arm64-sve-Disentangle-uapi-asm-ptrace.h-from-uapi-as.patch | 6 +++--- target/linux/generic/hack-4.19/204-module_strip.patch | 4 ++-- target/linux/generic/hack-4.19/902-debloat_proc.patch | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'target/linux/generic') diff --git a/target/linux/generic/backport-4.19/210-arm64-sve-Disentangle-uapi-asm-ptrace.h-from-uapi-as.patch b/target/linux/generic/backport-4.19/210-arm64-sve-Disentangle-uapi-asm-ptrace.h-from-uapi-as.patch index e638e07026..7c574fd343 100644 --- a/target/linux/generic/backport-4.19/210-arm64-sve-Disentangle-uapi-asm-ptrace.h-from-uapi-as.patch +++ b/target/linux/generic/backport-4.19/210-arm64-sve-Disentangle-uapi-asm-ptrace.h-from-uapi-as.patch @@ -52,7 +52,7 @@ Signed-off-by: Will Deacon /* -@@ -128,9 +128,9 @@ struct user_sve_header { +@@ -129,9 +129,9 @@ struct user_sve_header { */ /* Offset from the start of struct user_sve_header to the register data */ @@ -65,7 +65,7 @@ Signed-off-by: Will Deacon /* * The register data content and layout depends on the value of the -@@ -176,39 +176,36 @@ struct user_sve_header { +@@ -177,39 +177,36 @@ struct user_sve_header { * Additional data might be appended in the future. */ @@ -117,7 +117,7 @@ Signed-off-by: Will Deacon #define SVE_PT_SVE_FPCR_OFFSET(vq) \ (SVE_PT_SVE_FPSR_OFFSET(vq) + SVE_PT_SVE_FPSR_SIZE) -@@ -219,8 +216,8 @@ struct user_sve_header { +@@ -220,8 +217,8 @@ struct user_sve_header { #define SVE_PT_SVE_SIZE(vq, flags) \ ((SVE_PT_SVE_FPCR_OFFSET(vq) + SVE_PT_SVE_FPCR_SIZE \ diff --git a/target/linux/generic/hack-4.19/204-module_strip.patch b/target/linux/generic/hack-4.19/204-module_strip.patch index b9d7c886ae..41bb021e71 100644 --- a/target/linux/generic/hack-4.19/204-module_strip.patch +++ b/target/linux/generic/hack-4.19/204-module_strip.patch @@ -114,7 +114,7 @@ Signed-off-by: Felix Fietkau config MODULES_TREE_LOOKUP --- a/kernel/module.c +++ b/kernel/module.c -@@ -3027,9 +3027,11 @@ static int setup_load_info(struct load_i +@@ -3029,9 +3029,11 @@ static int setup_load_info(struct load_i static int check_modinfo(struct module *mod, struct load_info *info, int flags) { @@ -127,7 +127,7 @@ Signed-off-by: Felix Fietkau if (flags & MODULE_INIT_IGNORE_VERMAGIC) modmagic = NULL; -@@ -3050,6 +3052,7 @@ static int check_modinfo(struct module * +@@ -3052,6 +3054,7 @@ static int check_modinfo(struct module * mod->name); add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK); } 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 3ee7fdafd0..1442cee8bb 100644 --- a/target/linux/generic/hack-4.19/902-debloat_proc.patch +++ b/target/linux/generic/hack-4.19/902-debloat_proc.patch @@ -132,7 +132,7 @@ Signed-off-by: Felix Fietkau do { \ --- a/ipc/msg.c +++ b/ipc/msg.c -@@ -1291,6 +1291,9 @@ void __init msg_init(void) +@@ -1292,6 +1292,9 @@ void __init msg_init(void) { msg_init_ns(&init_ipc_ns); -- cgit v1.2.3