x86/crypto/camellia-aesni-avx2: Unconditionally allocate stack buffer

A conditional stack allocation violates traditional unwinding
requirements when a single instruction can have differing stack layouts.

There's no benefit in allocating the stack buffer conditionally.  Just
do it unconditionally.

Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Tested-by: Ard Biesheuvel <ardb@kernel.org>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
Tested-by: Sami Tolvanen <samitolvanen@google.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Link: https://lore.kernel.org/r/85ac96613ee5784b6239c18d3f68b1f3c509caa3.1614182415.git.jpoimboe@redhat.com

diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
index 782e9712a1ec6f29ce7aff3b1c9d1f4acd68018c..706f70829a07e8f3c76d5b3b76e8331e432ea80e 100644 (file)
--- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
+++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
@@ -990,6 +990,7 @@ SYM_FUNC_START(camellia_cbc_dec_32way)
         *      %rdx: src (32 blocks)
         */
        FRAME_BEGIN
+       subq $(16 * 32), %rsp;
 
        vzeroupper;
 
@@ -1002,7 +1003,6 @@ SYM_FUNC_START(camellia_cbc_dec_32way)
                     %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
                     %ymm15, %rdx, (key_table)(CTX, %r8, 8));
 
-       movq %rsp, %r10;
        cmpq %rsi, %rdx;
        je .Lcbc_dec_use_stack;
 
@@ -1015,7 +1015,6 @@ SYM_FUNC_START(camellia_cbc_dec_32way)
         * dst still in-use (because dst == src), so use stack for temporary
         * storage.
         */
-       subq $(16 * 32), %rsp;
        movq %rsp, %rax;
 
 .Lcbc_dec_continue:
@@ -1025,7 +1024,6 @@ SYM_FUNC_START(camellia_cbc_dec_32way)
        vpxor %ymm7, %ymm7, %ymm7;
        vinserti128 $1, (%rdx), %ymm7, %ymm7;
        vpxor (%rax), %ymm7, %ymm7;
-       movq %r10, %rsp;
        vpxor (0 * 32 + 16)(%rdx), %ymm6, %ymm6;
        vpxor (1 * 32 + 16)(%rdx), %ymm5, %ymm5;
        vpxor (2 * 32 + 16)(%rdx), %ymm4, %ymm4;
@@ -1047,6 +1045,7 @@ SYM_FUNC_START(camellia_cbc_dec_32way)
 
        vzeroupper;
 
+       addq $(16 * 32), %rsp;
        FRAME_END
        ret;
 SYM_FUNC_END(camellia_cbc_dec_32way)