Commit aa78fa90 authored by Helge Deller's avatar Helge Deller
Browse files

parisc: Fix vDSO signal breakage on 32-bit kernel 



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

The trampoline code (sigtramp.S) which is mapped into userspace includes
an offset to the context data on the stack, which is used by gdb and
glibc to get access to registers.

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

Reported-by: default avatarJohn David Anglin <dave.anglin@bell.net>
Tested-by: default avatarJohn David Anglin <dave.anglin@bell.net>
Fixes: 	df24e178 ("parisc: Add vDSO support")
CC: stable@vger.kernel.org # 5.18
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 96b80fcd

arch/parisc/kernel/asm-offsets.c

+5 −0
Original line number Diff line number Diff line
@@ -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));