summaryrefslogtreecommitdiff
path: root/arch/x86/crypto/aegis128-aesni-asm.S
diff options
context:
space:
mode:
authorBorislav Petkov <bp@alien8.de>2018-06-23 13:36:22 +0300
committerHerbert Xu <herbert@gondor.apana.org.au>2018-07-01 18:33:20 +0300
commit221e00d1fce976d8a04ff591a0150caf84e176f8 (patch)
tree1b5bc785c7b0a01ca8ae155ef3a8ecb1c11f7829 /arch/x86/crypto/aegis128-aesni-asm.S
parenta068b94d74ddb7776ca707b6d39d1ac0d2d057e6 (diff)
downloadlinux-221e00d1fce976d8a04ff591a0150caf84e176f8.tar.xz
crypto: x86 - Add missing RETs
Add explicit RETs to the tail calls of AEGIS and MORUS crypto algorithms otherwise they run into INT3 padding due to ("x86/asm: Pad assembly functions with INT3 instructions") leading to spurious debug exceptions. Mike Galbraith <efault@gmx.de> took care of all the remaining callsites. Signed-off-by: Borislav Petkov <bp@suse.de> Acked-by: Ondrej Mosnacek <omosnacek@gmail.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch/x86/crypto/aegis128-aesni-asm.S')
-rw-r--r--arch/x86/crypto/aegis128-aesni-asm.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/crypto/aegis128-aesni-asm.S b/arch/x86/crypto/aegis128-aesni-asm.S
index 9254e0b6cc06..717bf0776421 100644
--- a/arch/x86/crypto/aegis128-aesni-asm.S
+++ b/arch/x86/crypto/aegis128-aesni-asm.S
@@ -535,6 +535,7 @@ ENTRY(crypto_aegis128_aesni_enc_tail)
movdqu STATE3, 0x40(STATEP)
FRAME_END
+ ret
ENDPROC(crypto_aegis128_aesni_enc_tail)
.macro decrypt_block a s0 s1 s2 s3 s4 i