diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.9.21/0006-x86-speculation-objtool-Annotate-indirect-calls-jump.patch')
-rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.9.21/0006-x86-speculation-objtool-Annotate-indirect-calls-jump.patch | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.9.21/0006-x86-speculation-objtool-Annotate-indirect-calls-jump.patch b/common/recipes-kernel/linux/linux-yocto-4.9.21/0006-x86-speculation-objtool-Annotate-indirect-calls-jump.patch deleted file mode 100644 index ecb1cdd3..00000000 --- a/common/recipes-kernel/linux/linux-yocto-4.9.21/0006-x86-speculation-objtool-Annotate-indirect-calls-jump.patch +++ /dev/null @@ -1,57 +0,0 @@ -From b4f699a49be9bbfa6bb5408e7f54c89b9bdc8919 Mon Sep 17 00:00:00 2001 -From: Andy Whitcroft <apw@canonical.com> -Date: Wed, 14 Mar 2018 11:24:27 +0000 -Subject: [PATCH 06/93] x86/speculation, objtool: Annotate indirect calls/jumps - for objtool on 32-bit kernels - -commit a14bff131108faf50cc0cf864589fd71ee216c96 upstream. - -In the following commit: - - 9e0e3c5130e9 ("x86/speculation, objtool: Annotate indirect calls/jumps for objtool") - -... we added annotations for CALL_NOSPEC/JMP_NOSPEC on 64-bit x86 kernels, -but we did not annotate the 32-bit path. - -Annotate it similarly. - -Signed-off-by: Andy Whitcroft <apw@canonical.com> -Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> -Cc: Andy Lutomirski <luto@kernel.org> -Cc: Arjan van de Ven <arjan@linux.intel.com> -Cc: Borislav Petkov <bp@alien8.de> -Cc: Dan Williams <dan.j.williams@intel.com> -Cc: Dave Hansen <dave.hansen@linux.intel.com> -Cc: David Woodhouse <dwmw2@infradead.org> -Cc: David Woodhouse <dwmw@amazon.co.uk> -Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Cc: Josh Poimboeuf <jpoimboe@redhat.com> -Cc: Linus Torvalds <torvalds@linux-foundation.org> -Cc: Peter Zijlstra <peterz@infradead.org> -Cc: Thomas Gleixner <tglx@linutronix.de> -Link: http://lkml.kernel.org/r/20180314112427.22351-1-apw@canonical.com -Signed-off-by: Ingo Molnar <mingo@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - arch/x86/include/asm/nospec-branch.h | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h -index d0dabea..f928ad9 100644 ---- a/arch/x86/include/asm/nospec-branch.h -+++ b/arch/x86/include/asm/nospec-branch.h -@@ -183,7 +183,10 @@ - * otherwise we'll run out of registers. We don't care about CET - * here, anyway. - */ --# define CALL_NOSPEC ALTERNATIVE("call *%[thunk_target]\n", \ -+# define CALL_NOSPEC \ -+ ALTERNATIVE( \ -+ ANNOTATE_RETPOLINE_SAFE \ -+ "call *%[thunk_target]\n", \ - " jmp 904f;\n" \ - " .align 16\n" \ - "901: call 903f;\n" \ --- -2.7.4 - |