diff mbox series

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

Message ID DBBPR08MB554745791A0F2F42BC7D965DEFF89@DBBPR08MB5547.eurprd08.prod.outlook.com
State New
Headers show
Series [FFmpeg-devel] arm64: Fix wrong BTI landing pad | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_armv7_RPi4 success Make finished
andriy/make_fate_armv7_RPi4 success Make fate finished

Commit Message

Andre Kempe April 25, 2022, 8:33 a.m. UTC 
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@arm.com>
---
 libavcodec/aarch64/fft_neon.S | 1 +
 1 file changed, 1 insertion(+)

--
2.25.1

IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

Comments

Martin Storsjö April 26, 2022, 7:27 a.m. UTC | #1 
On Mon, 25 Apr 2022, Andre Kempe wrote:

> 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@arm.com>
> ---
> libavcodec/aarch64/fft_neon.S | 1 +
> 1 file changed, 1 insertion(+)

Thanks! I pushed this now.

// Martin
diff mbox series

Patch

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]