summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@arm.com>2020-10-27 18:02:40 +0100
committerTomas Mraz <tmraz@fedoraproject.org>2020-10-29 17:17:21 +0100
commitfcf6e9d056162d5af64c6f7209388a5c3be2ce57 (patch)
treea55bc8f6d66bbb0fb0ac03b83421aa15bd4e79cf
parent728d03b576f360e72bbddc7e751433575430af3b (diff)
crypto/poly1305/asm: fix armv8 pointer authentication
PAC pointer authentication signs the return address against the value of the stack pointer, to prevent stack overrun exploits from corrupting the control flow. However, this requires that the AUTIASP is issued with SP holding the same value as it held when the PAC value was generated. The Poly1305 armv8 code got this wrong, resulting in crashes on PAC capable hardware. Reviewed-by: Paul Dale <paul.dale@oracle.com> Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/13256)
-rwxr-xr-xcrypto/poly1305/asm/poly1305-armv8.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/poly1305/asm/poly1305-armv8.pl b/crypto/poly1305/asm/poly1305-armv8.pl
index d2d875ad6c..113a2151b6 100755
--- a/crypto/poly1305/asm/poly1305-armv8.pl
+++ b/crypto/poly1305/asm/poly1305-armv8.pl
@@ -866,8 +866,8 @@ poly1305_blocks_neon:
st1 {$ACC4}[0],[$ctx]
.Lno_data_neon:
- .inst 0xd50323bf // autiasp
ldr x29,[sp],#80
+ .inst 0xd50323bf // autiasp
ret
.size poly1305_blocks_neon,.-poly1305_blocks_neon