[PATCH 2/4] arm64: Track the sigreturn landing pad location

From: houdek . ryan
Date: Sat May 29 2021 - 04:17:09 EST


From: Ryan Houdek <Houdek.Ryan@xxxxxxxxxxx>

This will be required once userspace dispatch is implemented

Signed-off-by: Ryan Houdek <Houdek.Ryan@xxxxxxxxxxx>
---
arch/arm64/kernel/vdso/sigreturn.S | 1 +
arch/arm64/kernel/vdso/vdso.lds.S | 1 +
2 files changed, 2 insertions(+)

diff --git a/arch/arm64/kernel/vdso/sigreturn.S b/arch/arm64/kernel/vdso/sigreturn.S
index 0e18729abc3b..44ed8c5486d0 100644
--- a/arch/arm64/kernel/vdso/sigreturn.S
+++ b/arch/arm64/kernel/vdso/sigreturn.S
@@ -73,6 +73,7 @@ SYM_CODE_START(__kernel_rt_sigreturn)
mov x8, #__NR_rt_sigreturn
// PLEASE DO NOT MODIFY
svc #0
+SYM_INNER_LABEL(__kernel_vdso_sigreturn_landing_pad, SYM_L_GLOBAL)
// PLEASE DO NOT MODIFY
// .cfi_endproc
SYM_CODE_END(__kernel_rt_sigreturn)
diff --git a/arch/arm64/kernel/vdso/vdso.lds.S b/arch/arm64/kernel/vdso/vdso.lds.S
index a5e61e09ea92..65d2bd880e2f 100644
--- a/arch/arm64/kernel/vdso/vdso.lds.S
+++ b/arch/arm64/kernel/vdso/vdso.lds.S
@@ -91,3 +91,4 @@ VERSION
* Make the sigreturn code visible to the kernel.
*/
VDSO_sigtramp = __kernel_rt_sigreturn;
+VDSO_vdso_sigreturn_landing_pad = __kernel_vdso_sigreturn_landing_pad;
--
2.30.2