Skip to content

Commit c85fb28

Browse files
committed
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fix from Catalin Marinas: "Fix a kernel panic in the AES crypto code caused by a BR tail call not matching the target BTI instruction (when branch target identification is enabled)" * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: crypto: arm64: Use x16 with indirect branch to bti_c
2 parents 6ec37e6 + 39e4716 commit c85fb28

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/arm64/crypto/aes-neonbs-core.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,7 @@ SYM_FUNC_START_LOCAL(__xts_crypt8)
788788

789789
0: mov bskey, x21
790790
mov rounds, x22
791-
br x7
791+
br x16
792792
SYM_FUNC_END(__xts_crypt8)
793793

794794
.macro __xts_crypt, do8, o0, o1, o2, o3, o4, o5, o6, o7
@@ -806,7 +806,7 @@ SYM_FUNC_END(__xts_crypt8)
806806
uzp1 v30.4s, v30.4s, v25.4s
807807
ld1 {v25.16b}, [x24]
808808

809-
99: adr x7, \do8
809+
99: adr x16, \do8
810810
bl __xts_crypt8
811811

812812
ldp q16, q17, [sp, #.Lframe_local_offset]

0 commit comments

Comments
 (0)