Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 221e00d1 authored Jun 23, 2018 by Borislav Petkov Committed by Herbert Xu Jul 01, 2018

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>

parent a068b94d

arch/x86/crypto/aegis128-aesni-asm.S

+1 −0

Original line number	Diff line number	Diff line
		@@ -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

arch/x86/crypto/aegis128l-aesni-asm.S

+1 −0

Original line number	Diff line number	Diff line
		@@ -645,6 +645,7 @@ ENTRY(crypto_aegis128l_aesni_enc_tail)
		state_store0

		FRAME_END
		ret
		ENDPROC(crypto_aegis128l_aesni_enc_tail)

		/*

arch/x86/crypto/aegis256-aesni-asm.S

+1 −0

Original line number	Diff line number	Diff line
		@@ -543,6 +543,7 @@ ENTRY(crypto_aegis256_aesni_enc_tail)
		state_store0

		FRAME_END
		ret
		ENDPROC(crypto_aegis256_aesni_enc_tail)

		/*

arch/x86/crypto/morus1280-avx2-asm.S

+1 −0

Original line number	Diff line number	Diff line
		@@ -453,6 +453,7 @@ ENTRY(crypto_morus1280_avx2_enc_tail)
		vmovdqu STATE4, (4 * 32)(%rdi)

		FRAME_END
		ret
		ENDPROC(crypto_morus1280_avx2_enc_tail)

		/*

arch/x86/crypto/morus1280-sse2-asm.S

+1 −0

Original line number	Diff line number	Diff line
		@@ -652,6 +652,7 @@ ENTRY(crypto_morus1280_sse2_enc_tail)
		movdqu STATE4_HI, (9 * 16)(%rdi)

		FRAME_END
		ret
		ENDPROC(crypto_morus1280_sse2_enc_tail)

		/*