Dapper Secure Kernel Patchset Stable 4.9.86

Author: matthewruffell

init_rebase.sh

@@ -1,5 +1,5 @@
 KERNEL_MAJOR_VERSION=4.9
-KERNEL_VERSION=4.9.85
+KERNEL_VERSION=4.9.86
 
 echo "Setting up rebase directory..."
 rm -rf rebase

kernel/patch-4.9.86.xz

@@ -1,6 +1,6 @@
 DATE=`date +%Y-%m-%d`
 KERNEL_MAJOR_VERSION=4.9
-KERNEL_VERSION=4.9.85
+KERNEL_VERSION=4.9.86
 
 echo "Setting up release directory..."
 mkdir release

make_release.sh

@@ -2981,3 +2981,23 @@ index 000000000000..6e0bd52ad53d
 +
 +	return nerrs ? 1 : 0;
 +}
+diff --git a/arch/x86/include/asm/asm.h b/arch/x86/include/asm/asm.h
+index 7acb51c49fec..00523524edbf 100644
+--- a/arch/x86/include/asm/asm.h
++++ b/arch/x86/include/asm/asm.h
+@@ -125,4 +125,15 @@
+ /* For C file, we already have NOKPROBE_SYMBOL macro */
+ #endif
+ 
++#ifndef __ASSEMBLY__
++/*
++ * This output constraint should be used for any inline asm which has a "call"
++ * instruction.  Otherwise the asm may be inserted before the frame pointer
++ * gets set up by the containing function.  If you forget to do this, objtool
++ * may print a "call without frame pointer save/setup" warning.
++ */
++register unsigned long current_stack_pointer asm(_ASM_SP);
++#define ASM_CALL_CONSTRAINT "+r" (current_stack_pointer)
++#endif
++
+ #endif /* _ASM_X86_ASM_H */

omitted-patches/included-patches/include-4.9.77.patch

@@ -568,26 +568,6 @@ index 44b8762fa0c7..b15aa4083dfd 100644
 +INDIRECT_THUNK(bp)
 +INDIRECT_THUNK(sp)
 +#endif /* CONFIG_RETPOLINE */
-diff --git a/arch/x86/include/asm/asm.h b/arch/x86/include/asm/asm.h
-index 7acb51c49fec..00523524edbf 100644
---- a/arch/x86/include/asm/asm.h
-+++ b/arch/x86/include/asm/asm.h
-@@ -125,4 +125,15 @@
- /* For C file, we already have NOKPROBE_SYMBOL macro */
- #endif
- 
-+#ifndef __ASSEMBLY__
-+/*
-+ * This output constraint should be used for any inline asm which has a "call"
-+ * instruction.  Otherwise the asm may be inserted before the frame pointer
-+ * gets set up by the containing function.  If you forget to do this, objtool
-+ * may print a "call without frame pointer save/setup" warning.
-+ */
-+register unsigned long current_stack_pointer asm(_ASM_SP);
-+#define ASM_CALL_CONSTRAINT "+r" (current_stack_pointer)
-+#endif
-+
- #endif /* _ASM_X86_ASM_H */
 diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
 index 1d2b69fc0ceb..9ea67a04ff4f 100644
 --- a/arch/x86/include/asm/cpufeature.h

omitted-patches/omit-4.9.77.patch

@@ -4,6 +4,7 @@
 
 # ADD NEWEST FIRST
 
+# 4.9.86 does not need any omissions
 patch -F 0 -R -p1 < ../../omitted-patches/omit-4.9.85.patch
 patch -F 0 -R -p1 < ../../omitted-patches/omit-4.9.84.patch
 patch -F 0 -R -p1 < ../../omitted-patches/omit-4.9.83.patch