Skip to contentSkip to conversation

parisc: Fix vDSO signal breakage on 32-bit kernel

PATCH New Helge Deller 1 participant 1 message Jul 1, 2022 PA-RISC architecture

lore
Share & tools
lore

Helge Deller

author maintainer
#0 lore raw

PATCH 1/1 parisc: Fix vDSO signal breakage on 32-bit kernel

Addition of vDSO support for parisc in kernel v5.18 suddenly broke glibc testcases on a 32-bit kernel which used signals.

The trampoline code (sigtramp.S) which is mapped into userspace processes includes offsets to the context data on the stack, which are used by gdb and glibc to get the correct data.

In a 32-bit kernel we used by mistake the offsets into the compat context (which is valid on a 64-bit kernel only) instead of the offsets into the "native" 32-bit context.

Fixes df24e1783e6e ("parisc: Add vDSO support")
arch/parisc/kernel/asm-offsets.c +5 -0
index 2673d57eeb00..94652e13c260 100644
@@ -224,8 +224,13 @@ int main(void)
 	BLANK();
 	DEFINE(ASM_SIGFRAME_SIZE, PARISC_RT_SIGFRAME_SIZE);
 	DEFINE(SIGFRAME_CONTEXT_REGS, offsetof(struct rt_sigframe, uc.uc_mcontext) - PARISC_RT_SIGFRAME_SIZE);
+#ifdef CONFIG_64BIT
 	DEFINE(ASM_SIGFRAME_SIZE32, PARISC_RT_SIGFRAME_SIZE32);
 	DEFINE(SIGFRAME_CONTEXT_REGS32, offsetof(struct compat_rt_sigframe, uc.uc_mcontext) - PARISC_RT_SIGFRAME_SIZE32);
+#else
+	DEFINE(ASM_SIGFRAME_SIZE32, PARISC_RT_SIGFRAME_SIZE);
+	DEFINE(SIGFRAME_CONTEXT_REGS32, offsetof(struct rt_sigframe, uc.uc_mcontext) - PARISC_RT_SIGFRAME_SIZE);
+#endif
 	BLANK();
 	DEFINE(ICACHE_BASE, offsetof(struct pdc_cache_info, ic_base));
 	DEFINE(ICACHE_STRIDE, offsetof(struct pdc_cache_info, ic_stride));