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 PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 18 Sep 2017 14:42:06 -0500 From: Josh Poimboeuf <jpoimboe@...hat.com> To: Herbert Xu <herbert@...dor.apana.org.au>, "David S. Miller" <davem@...emloft.net> Cc: x86@...nel.org, linux-kernel@...r.kernel.org, Tim Chen <tim.c.chen@...ux.intel.com>, Mathias Krause <minipli@...glemail.com>, Jussi Kivilinna <jussi.kivilinna@....fi>, Peter Zijlstra <peterz@...radead.org>, linux-crypto@...r.kernel.org, Eric Biggers <ebiggers@...gle.com>, Andy Lutomirski <luto@...nel.org>, Jiri Slaby <jslaby@...e.cz> Subject: [PATCH v2 07/12] x86/crypto: Fix RBP usage in sha1_ssse3_asm.S Using RBP as a temporary register breaks frame pointer convention and breaks stack traces when unwinding from an interrupt in the crypto code. Swap the usages of R12 and RBP. Use R12 for the REG_D register, and use RBP to store the pre-aligned stack pointer. Reported-by: Eric Biggers <ebiggers@...gle.com> Reported-by: Peter Zijlstra <peterz@...radead.org> Tested-by: Eric Biggers <ebiggers@...gle.com> Acked-by: Eric Biggers <ebiggers@...gle.com> Signed-off-by: Josh Poimboeuf <jpoimboe@...hat.com> --- arch/x86/crypto/sha1_ssse3_asm.S | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S index a4109506a5e8..6204bd53528c 100644 --- a/arch/x86/crypto/sha1_ssse3_asm.S +++ b/arch/x86/crypto/sha1_ssse3_asm.S @@ -37,7 +37,7 @@ #define REG_A %ecx #define REG_B %esi #define REG_C %edi -#define REG_D %ebp +#define REG_D %r12d #define REG_E %edx #define REG_T1 %eax @@ -74,10 +74,10 @@ ENTRY(\name) push %rbx - push %rbp push %r12 + push %rbp + mov %rsp, %rbp - mov %rsp, %r12 sub $64, %rsp # allocate workspace and $~15, %rsp # align stack @@ -99,10 +99,9 @@ xor %rax, %rax rep stosq - mov %r12, %rsp # deallocate workspace - - pop %r12 + mov %rbp, %rsp # deallocate workspace pop %rbp + pop %r12 pop %rbx ret -- 2.13.5
Powered by blists - more mailing lists