Commit a428636d authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Herbert Xu

crypto: arm64/ghash-ce - use frame_push/pop macros consistently

Use the frame_push and frame_pop macros to set up the stack frame so
that return address protections will be enabled automically when
configured.
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 489a4a05
...@@ -436,9 +436,7 @@ SYM_FUNC_END(pmull_ghash_update_p8) ...@@ -436,9 +436,7 @@ SYM_FUNC_END(pmull_ghash_update_p8)
.align 6 .align 6
.macro pmull_gcm_do_crypt, enc .macro pmull_gcm_do_crypt, enc
stp x29, x30, [sp, #-32]! frame_push 1
mov x29, sp
str x19, [sp, #24]
load_round_keys x7, x6, x8 load_round_keys x7, x6, x8
...@@ -529,7 +527,7 @@ CPU_LE( rev w8, w8 ) ...@@ -529,7 +527,7 @@ CPU_LE( rev w8, w8 )
.endif .endif
bne 0b bne 0b
3: ldp x19, x10, [sp, #24] 3: ldr x10, [sp, #.Lframe_local_offset]
cbz x10, 5f // output tag? cbz x10, 5f // output tag?
ld1 {INP3.16b}, [x10] // load lengths[] ld1 {INP3.16b}, [x10] // load lengths[]
...@@ -562,7 +560,7 @@ CPU_LE( rev w8, w8 ) ...@@ -562,7 +560,7 @@ CPU_LE( rev w8, w8 )
smov w0, v0.b[0] // return b0 smov w0, v0.b[0] // return b0
.endif .endif
4: ldp x29, x30, [sp], #32 4: frame_pop
ret ret
5: 5:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment