]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
riscv: alternative: Also patch the CFI vDSO
authorThomas Weißschuh <thomas.weissschuh@linutronix.de>
Mon, 4 May 2026 06:30:53 +0000 (08:30 +0200)
committerPaul Walmsley <pjw@kernel.org>
Sun, 7 Jun 2026 07:56:28 +0000 (01:56 -0600)
The dedicated vDSO for CFI-enabled userspace can also contain
alternative entries.

Patch those, too.

Fixes: ccad8c1336b6 ("arch/riscv: add dual vdso creation logic and select vdso based on hw")
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Link: https://patch.msgid.link/20260504-riscv-cfi-vdso-alternative-v1-4-bcdf3d37f62e@linutronix.de
Signed-off-by: Paul Walmsley <pjw@kernel.org>
arch/riscv/kernel/alternative.c

index 89c283a5cec7ff98e1e1dc6a2da5d43d5212398f..104dc0862c5c2e8411328a9701542cf2dc48a6ef 100644 (file)
@@ -205,6 +205,9 @@ void __init apply_boot_alternatives(void)
 
        if (IS_ENABLED(CONFIG_MMU))
                apply_vdso_alternatives(vdso_start);
+
+       if (IS_ENABLED(CONFIG_RISCV_USER_CFI))
+               apply_vdso_alternatives(vdso_cfi_start);
 }
 
 /*