crypto: x86/camellia - Fix RBP usage
Using RBP as a temporary register breaks frame pointer convention and breaks stack traces when unwinding from an interrupt in the crypto code. Use R12 instead of RBP. Both are callee-saved registers, so the substitution is straightforward. Reported-by: Eric Biggers <ebiggers@google.com> Reported-by: Peter Zijlstra <peterz@infradead.org> Tested-by: Eric Biggers <ebiggers@google.com> Acked-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Родитель
569f11c9f7
Коммит
b46c9d7176
|
@ -75,17 +75,17 @@
|
|||
#define RCD1bh %dh
|
||||
|
||||
#define RT0 %rsi
|
||||
#define RT1 %rbp
|
||||
#define RT1 %r12
|
||||
#define RT2 %r8
|
||||
|
||||
#define RT0d %esi
|
||||
#define RT1d %ebp
|
||||
#define RT1d %r12d
|
||||
#define RT2d %r8d
|
||||
|
||||
#define RT2bl %r8b
|
||||
|
||||
#define RXOR %r9
|
||||
#define RRBP %r10
|
||||
#define RR12 %r10
|
||||
#define RDST %r11
|
||||
|
||||
#define RXORd %r9d
|
||||
|
@ -197,7 +197,7 @@ ENTRY(__camellia_enc_blk)
|
|||
* %rdx: src
|
||||
* %rcx: bool xor
|
||||
*/
|
||||
movq %rbp, RRBP;
|
||||
movq %r12, RR12;
|
||||
|
||||
movq %rcx, RXOR;
|
||||
movq %rsi, RDST;
|
||||
|
@ -227,13 +227,13 @@ ENTRY(__camellia_enc_blk)
|
|||
|
||||
enc_outunpack(mov, RT1);
|
||||
|
||||
movq RRBP, %rbp;
|
||||
movq RR12, %r12;
|
||||
ret;
|
||||
|
||||
.L__enc_xor:
|
||||
enc_outunpack(xor, RT1);
|
||||
|
||||
movq RRBP, %rbp;
|
||||
movq RR12, %r12;
|
||||
ret;
|
||||
ENDPROC(__camellia_enc_blk)
|
||||
|
||||
|
@ -248,7 +248,7 @@ ENTRY(camellia_dec_blk)
|
|||
movl $24, RXORd;
|
||||
cmovel RXORd, RT2d; /* max */
|
||||
|
||||
movq %rbp, RRBP;
|
||||
movq %r12, RR12;
|
||||
movq %rsi, RDST;
|
||||
movq %rdx, RIO;
|
||||
|
||||
|
@ -271,7 +271,7 @@ ENTRY(camellia_dec_blk)
|
|||
|
||||
dec_outunpack();
|
||||
|
||||
movq RRBP, %rbp;
|
||||
movq RR12, %r12;
|
||||
ret;
|
||||
ENDPROC(camellia_dec_blk)
|
||||
|
||||
|
@ -433,7 +433,7 @@ ENTRY(__camellia_enc_blk_2way)
|
|||
*/
|
||||
pushq %rbx;
|
||||
|
||||
movq %rbp, RRBP;
|
||||
movq %r12, RR12;
|
||||
movq %rcx, RXOR;
|
||||
movq %rsi, RDST;
|
||||
movq %rdx, RIO;
|
||||
|
@ -461,14 +461,14 @@ ENTRY(__camellia_enc_blk_2way)
|
|||
|
||||
enc_outunpack2(mov, RT2);
|
||||
|
||||
movq RRBP, %rbp;
|
||||
movq RR12, %r12;
|
||||
popq %rbx;
|
||||
ret;
|
||||
|
||||
.L__enc2_xor:
|
||||
enc_outunpack2(xor, RT2);
|
||||
|
||||
movq RRBP, %rbp;
|
||||
movq RR12, %r12;
|
||||
popq %rbx;
|
||||
ret;
|
||||
ENDPROC(__camellia_enc_blk_2way)
|
||||
|
@ -485,7 +485,7 @@ ENTRY(camellia_dec_blk_2way)
|
|||
cmovel RXORd, RT2d; /* max */
|
||||
|
||||
movq %rbx, RXOR;
|
||||
movq %rbp, RRBP;
|
||||
movq %r12, RR12;
|
||||
movq %rsi, RDST;
|
||||
movq %rdx, RIO;
|
||||
|
||||
|
@ -508,7 +508,7 @@ ENTRY(camellia_dec_blk_2way)
|
|||
|
||||
dec_outunpack2();
|
||||
|
||||
movq RRBP, %rbp;
|
||||
movq RR12, %r12;
|
||||
movq RXOR, %rbx;
|
||||
ret;
|
||||
ENDPROC(camellia_dec_blk_2way)
|
||||
|
|
Загрузка…
Ссылка в новой задаче