diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-06 12:09:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-06 12:09:29 -0700 |
| commit | c85fb28b6f999db9928b841f63f1beeb3074eeca (patch) | |
| tree | cd46cf69ee4164bb2500235cc40ac8cd9d0eb79a /arch | |
| parent | 6ec37e6bb1fa1d6d6ba6bf0e2d93a148c53c8976 (diff) | |
| parent | 39e4716caa598a07a98598b2e7cd03055ce25fb9 (diff) | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/crypto/aes-neonbs-core.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/crypto/aes-neonbs-core.S b/arch/arm64/crypto/aes-neonbs-core.S index b357164379f6..63a52ad9a75c 100644 --- a/arch/arm64/crypto/aes-neonbs-core.S +++ b/arch/arm64/crypto/aes-neonbs-core.S @@ -788,7 +788,7 @@ SYM_FUNC_START_LOCAL(__xts_crypt8) 0: mov bskey, x21 mov rounds, x22 - br x7 + br x16 SYM_FUNC_END(__xts_crypt8) .macro __xts_crypt, do8, o0, o1, o2, o3, o4, o5, o6, o7 @@ -806,7 +806,7 @@ SYM_FUNC_END(__xts_crypt8) uzp1 v30.4s, v30.4s, v25.4s ld1 {v25.16b}, [x24] -99: adr x7, \do8 +99: adr x16, \do8 bl __xts_crypt8 ldp q16, q17, [sp, #.Lframe_local_offset] |