[FFmpeg-cvslog] arm64: Fix wrong BTI landing pad

Andre Kempe git at videolan.org
Tue Apr 26 10:26:58 EEST 2022


ffmpeg | branch: master | Andre Kempe <Andre.Kempe at arm.com> | Mon Apr 25 08:33:40 2022 +0000| [861285c146b267187af20a63c8541c4e5a4d871e] | committer: Martin Storsjö

arm64: Fix wrong BTI landing pad

This patch fixes a wrong type of BTI landing pad when branching to
functions instantiated via the fft*_neon macro.

Although the previously employed paciasp instruction serves as a landing
pad, for the ways that this function is invoked it is the wrong type, resulting
in an unexpected termination of the running process.

Signed-off-by: André Kempe <andre.kempe at arm.com>
Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=861285c146b267187af20a63c8541c4e5a4d871e
---

 libavcodec/aarch64/fft_neon.S | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/aarch64/fft_neon.S b/libavcodec/aarch64/fft_neon.S
index dd5f55eb87..9ff3f9c526 100644
--- a/libavcodec/aarch64/fft_neon.S
+++ b/libavcodec/aarch64/fft_neon.S
@@ -340,6 +340,7 @@ endfunc
 
 .macro  def_fft n, n2, n4
 function fft\n\()_neon, align=6
+        AARCH64_VALID_JUMP_TARGET
         AARCH64_SIGN_LINK_REGISTER
         sub             sp,  sp,  #16
         stp             x28, x30, [sp]



More information about the ffmpeg-cvslog mailing list