From 3a2668c6d5111d0f98922157b204263cef8603d7 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Wed, 20 Feb 2019 16:02:26 +0100 Subject: kernel: bump 4.14 to 4.14.102 Refreshed all patches. Remove upstreamed: - 272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch Remove upstreamed hunks: - 080-pinctrl-msm-fix-gpio-hog-related-boot-issues.patch Fixes: - CVE-2018-1000026 Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte --- ...-0001-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch | 2 +- .../linux/brcm2708/patches-4.14/950-0031-Update-vfpmodule.c.patch | 6 +++--- ...-0061-Improve-__copy_to_user-and-__copy_from_user-performa.patch | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'target/linux/brcm2708/patches-4.14') diff --git a/target/linux/brcm2708/patches-4.14/950-0001-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch b/target/linux/brcm2708/patches-4.14/950-0001-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch index 7becfb3d9a..7c728b22ae 100644 --- a/target/linux/brcm2708/patches-4.14/950-0001-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch +++ b/target/linux/brcm2708/patches-4.14/950-0001-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch @@ -76,7 +76,7 @@ Subject: [PATCH 001/454] arm: partially revert --- a/arch/arm/mm/proc-macros.S +++ b/arch/arm/mm/proc-macros.S -@@ -325,6 +325,8 @@ ENTRY(\name\()_cache_fns) +@@ -335,6 +335,8 @@ ENTRY(\name\()_cache_fns) .long \name\()_flush_kern_dcache_area .long \name\()_dma_map_area .long \name\()_dma_unmap_area diff --git a/target/linux/brcm2708/patches-4.14/950-0031-Update-vfpmodule.c.patch b/target/linux/brcm2708/patches-4.14/950-0031-Update-vfpmodule.c.patch index 6647e5a4f8..3d8106d2a5 100644 --- a/target/linux/brcm2708/patches-4.14/950-0031-Update-vfpmodule.c.patch +++ b/target/linux/brcm2708/patches-4.14/950-0031-Update-vfpmodule.c.patch @@ -102,7 +102,7 @@ Signed-off-by: Christopher Alexander Tobias Schulze vfp_save_state(&thread->vfpstate, fpexc | FPEXC_EN); fmxr(FPEXC, fpexc); } -@@ -602,6 +609,8 @@ int vfp_restore_user_hwstate(struct user +@@ -598,6 +605,8 @@ int vfp_restore_user_hwstate(struct user struct thread_info *thread = current_thread_info(); struct vfp_hard_struct *hwstate = &thread->vfpstate.hard; unsigned long fpexc; @@ -111,7 +111,7 @@ Signed-off-by: Christopher Alexander Tobias Schulze /* Disable VFP to avoid corrupting the new thread state. */ vfp_flush_hwstate(thread); -@@ -624,8 +633,12 @@ int vfp_restore_user_hwstate(struct user +@@ -620,8 +629,12 @@ int vfp_restore_user_hwstate(struct user /* Ensure the VFP is enabled. */ fpexc |= FPEXC_EN; @@ -126,7 +126,7 @@ Signed-off-by: Christopher Alexander Tobias Schulze hwstate->fpexc = fpexc; hwstate->fpinst = ufp_exc->fpinst; -@@ -695,7 +708,8 @@ void kernel_neon_begin(void) +@@ -691,7 +704,8 @@ void kernel_neon_begin(void) cpu = get_cpu(); fpexc = fmrx(FPEXC) | FPEXC_EN; diff --git a/target/linux/brcm2708/patches-4.14/950-0061-Improve-__copy_to_user-and-__copy_from_user-performa.patch b/target/linux/brcm2708/patches-4.14/950-0061-Improve-__copy_to_user-and-__copy_from_user-performa.patch index 924fef4cba..157f76f159 100644 --- a/target/linux/brcm2708/patches-4.14/950-0061-Improve-__copy_to_user-and-__copy_from_user-performa.patch +++ b/target/linux/brcm2708/patches-4.14/950-0061-Improve-__copy_to_user-and-__copy_from_user-performa.patch @@ -58,7 +58,7 @@ Signed-off-by: Phil Elwell #define memset(p,v,n) \ --- a/arch/arm/include/asm/uaccess.h +++ b/arch/arm/include/asm/uaccess.h -@@ -459,6 +459,9 @@ do { \ +@@ -496,6 +496,9 @@ do { \ extern unsigned long __must_check arm_copy_from_user(void *to, const void __user *from, unsigned long n); @@ -273,7 +273,7 @@ Signed-off-by: Phil Elwell #ifdef CONFIG_CPU_SPECTRE get_thread_info r3 ldr r3, [r3, #TI_ADDR_LIMIT] -@@ -103,6 +104,7 @@ ENTRY(arm_copy_from_user) +@@ -99,6 +100,7 @@ ENTRY(arm_copy_from_user) #include "copy_template.S" ENDPROC(arm_copy_from_user) @@ -1507,7 +1507,7 @@ Signed-off-by: Phil Elwell unsigned long ua_flags = uaccess_save_and_enable(); n = __copy_to_user_std(to, from, n); uaccess_restore(ua_flags); -@@ -156,6 +252,26 @@ arm_copy_to_user(void __user *to, const +@@ -157,6 +253,26 @@ arm_copy_to_user(void __user *to, const } return n; } -- cgit v1.2.3