lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 11 Jan 2018 21:46:29 +0000 From: David Woodhouse <dwmw@...zon.co.uk> To: Andi Kleen <ak@...ux.intel.com> Cc: Paul Turner <pjt@...gle.com>, LKML <linux-kernel@...r.kernel.org>, Linus Torvalds <torvalds@...ux-foundation.org>, Greg Kroah-Hartman <gregkh@...ux-foundation.org>, Tim Chen <tim.c.chen@...ux.intel.com>, Dave Hansen <dave.hansen@...el.com>, tglx@...utronix.de, Kees Cook <keescook@...gle.com>, Rik van Riel <riel@...hat.com>, Peter Zijlstra <peterz@...radead.org>, Andy Lutomirski <luto@...capital.net>, Jiri Kosina <jikos@...nel.org>, gnomes@...rguk.ukuu.org.uk, x86@...nel.org, thomas.lendacky@....com, Josh Poimboeuf <jpoimboe@...hat.com> Subject: [PATCH v8 07/12] x86/retpoline/ftrace: Convert ftrace assembler indirect jumps Convert all indirect jumps in ftrace assembler code to use non-speculative sequences when CONFIG_RETPOLINE is enabled. Signed-off-by: David Woodhouse <dwmw@...zon.co.uk> Signed-off-by: Thomas Gleixner <tglx@...utronix.de> Acked-by: Arjan van de Ven <arjan@...ux.intel.com> Acked-by: Ingo Molnar <mingo@...nel.org> Cc: gnomes@...rguk.ukuu.org.uk Cc: Rik van Riel <riel@...hat.com> Cc: Andi Kleen <ak@...ux.intel.com> Cc: Peter Zijlstra <peterz@...radead.org> Cc: Linus Torvalds <torvalds@...ux-foundation.org> Cc: Jiri Kosina <jikos@...nel.org> Cc: Andy Lutomirski <luto@...capital.net> Cc: Dave Hansen <dave.hansen@...el.com> Cc: Kees Cook <keescook@...gle.com> Cc: Tim Chen <tim.c.chen@...ux.intel.com> Cc: Greg Kroah-Hartman <gregkh@...ux-foundation.org> Cc: Paul Turner <pjt@...gle.com> Link: https://lkml.kernel.org/r/1515508997-6154-7-git-send-email-dwmw@amazon.co.uk --- arch/x86/kernel/ftrace_32.S | 6 ++++-- arch/x86/kernel/ftrace_64.S | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/ftrace_32.S b/arch/x86/kernel/ftrace_32.S index b6c6468..4c8440d 100644 --- a/arch/x86/kernel/ftrace_32.S +++ b/arch/x86/kernel/ftrace_32.S @@ -8,6 +8,7 @@ #include <asm/segment.h> #include <asm/export.h> #include <asm/ftrace.h> +#include <asm/nospec-branch.h> #ifdef CC_USING_FENTRY # define function_hook __fentry__ @@ -197,7 +198,8 @@ ftrace_stub: movl 0x4(%ebp), %edx subl $MCOUNT_INSN_SIZE, %eax - call *ftrace_trace_function + movl ftrace_trace_function, %ecx + CALL_NOSPEC %ecx popl %edx popl %ecx @@ -241,5 +243,5 @@ return_to_handler: movl %eax, %ecx popl %edx popl %eax - jmp *%ecx + JMP_NOSPEC %ecx #endif diff --git a/arch/x86/kernel/ftrace_64.S b/arch/x86/kernel/ftrace_64.S index c832291..7cb8ba0 100644 --- a/arch/x86/kernel/ftrace_64.S +++ b/arch/x86/kernel/ftrace_64.S @@ -7,7 +7,7 @@ #include <asm/ptrace.h> #include <asm/ftrace.h> #include <asm/export.h> - +#include <asm/nospec-branch.h> .code64 .section .entry.text, "ax" @@ -286,8 +286,8 @@ trace: * ip and parent ip are used and the list function is called when * function tracing is enabled. */ - call *ftrace_trace_function - + movq ftrace_trace_function, %r8 + CALL_NOSPEC %r8 restore_mcount_regs jmp fgraph_trace @@ -329,5 +329,5 @@ GLOBAL(return_to_handler) movq 8(%rsp), %rdx movq (%rsp), %rax addq $24, %rsp - jmp *%rdi + JMP_NOSPEC %rdi #endif -- 2.7.4
Powered by blists - more mailing lists