diff options
Diffstat (limited to 'grsec_arch.patch')
| -rw-r--r-- | grsec_arch.patch | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/grsec_arch.patch b/grsec_arch.patch index 152e3a6bd365..323e44fd02fa 100644 --- a/grsec_arch.patch +++ b/grsec_arch.patch @@ -1,22 +1,29 @@ diff -uNr 15.12/common/lib/modules/fglrx//build_mod/firegl_public.c 15.12b/common/lib/modules/fglrx//build_mod/firegl_public.c ---- 15.12/common/lib/modules/fglrx//build_mod/firegl_public.c 2015-12-13 15:12:03.000000000 +0100 -+++ 15.12b/common/lib/modules/fglrx//build_mod/firegl_public.c 2015-12-13 19:40:34.991656996 +0100 -@@ -6468,9 +6468,14 @@ - fpu_xsave(fpu); - if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP)) - #else +--- 15.12/common/lib/modules/fglrx//build_mod/firegl_public.c 2015-12-19 21:14:13.251002548 +0100 ++++ 15.12b/common/lib/modules/fglrx//build_mod/firegl_public.c 2015-12-19 21:36:27.703783498 +0100 +@@ -6465,11 +6465,21 @@ + + if(static_cpu_has(X86_FEATURE_XSAVE)) { + #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0) ++#ifdef CONFIG_GRKERNSEC ++ copy_xregs_to_kernel(&fpu->state->xsave); ++ if (!(fpu->state->xsave.header.xfeatures & XFEATURE_MASK_FP)) ++#else + copy_xregs_to_kernel(&fpu->state.xsave); + if (!(fpu->state.xsave.header.xfeatures & XFEATURE_MASK_FP)) ++#endif + #elif LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) +#ifdef CONFIG_GRKERNSEC + copy_xregs_to_kernel(&fpu->state->xsave); + if (!(fpu->state->xsave.header.xfeatures & XSTATE_FP)) +#else copy_xregs_to_kernel(&fpu->state.xsave); if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP)) - #endif +#endif - return 1; - } else if (static_cpu_has(X86_FEATURE_FXSR)) { - #if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) -@@ -6483,8 +6488,12 @@ + #else + fpu_xsave(fpu); + if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP)) +@@ -6486,8 +6496,12 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) : [fx] "=m" (fpu->state->fsave)); #else @@ -30,8 +37,8 @@ diff -uNr 15.12/common/lib/modules/fglrx//build_mod/firegl_public.c 15.12b/commo } diff -uNr 15.12/common/lib/modules/fglrx//build_mod/kcl_acpi.c 15.12b/common/lib/modules/fglrx//build_mod/kcl_acpi.c ---- 15.12/common/lib/modules/fglrx//build_mod/kcl_acpi.c 2015-12-13 15:12:03.000000000 +0100 -+++ 15.12b/common/lib/modules/fglrx//build_mod/kcl_acpi.c 2015-12-13 19:44:36.774418592 +0100 +--- 15.12/common/lib/modules/fglrx//build_mod/kcl_acpi.c 2015-12-19 21:14:13.247669219 +0100 ++++ 15.12b/common/lib/modules/fglrx//build_mod/kcl_acpi.c 2015-12-19 21:10:27.224899708 +0100 @@ -145,7 +145,11 @@ return NOTIFY_OK; } |