sparc: fix compat siginfo ABI regression
PATCH 1/1 sparc: fix compat siginfo ABI regression
Starting with commit v4.14-rc1~60^2^2~1, a SIGFPE signal sent via kill results to wrong values in si_pid and si_uid fields of compat siginfo_t.
This happens due to FPE_FIXME being defined to 0 for sparc, and at the same time siginfo_layout() introduced by the same commit returns SIL_FAULT for SIGFPE if si_code = SI_USER and FPE_FIXME is defined to 0.
Fix this regression by removing FPE_FIXME macro and changing all its users to assign FPE_FLTUNK to si_code instead of FPE_FIXME.
Note that FPE_FLTUNK is a new macro introduced by commit 266da65e9156d93e1126e185259a4aae68188d0e.
Tested with commit v4.16-11958-g16e205cf42da.
This bug was found by strace test suite.
Thanks-to: Anatoly Pugachev <[email protected]>
--- arch/sparc/include/uapi/asm/siginfo.h | 7 ------- arch/sparc/kernel/traps_32.c | 2 +- arch/sparc/kernel/traps_64.c | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-)
arch/sparc/include/uapi/asm/siginfo.h +0 -7
@@ -18,13 +18,6 @@#define SI_NOINFO 32767/* no information in siginfo_t */ /* -* SIGFPE si_codes -*/ -#ifdef __KERNEL__ -#define FPE_FIXME 0/* Broken dup of SI_USER */ -#endif /* __KERNEL__ */ - -/* * SIGEMT si_codes */ #define EMT_TAGOVF 1/* tag overflow */
arch/sparc/kernel/traps_32.c +1 -1
@@ -307,7 +307,7 @@ void do_fpe_trap(struct pt_regs *regs, unsigned long pc, unsigned long npc, info.si_errno =0 ; info.si_addr = (void __user *)pc; info.si_trapno =0 ; - info.si_code =FPE_FIXME ; + info.si_code =FPE_FLTUNK ;if ((fsr &0x1c000 ) = (1 <<14 )) {if (fsr &0x10 ) info.si_code =FPE_FLTINV ;
arch/sparc/kernel/traps_64.c +1 -1
@@ -2372,7 +2372,7 @@ static void do_fpe_common(struct pt_regs *regs) info.si_errno =0 ; info.si_addr = (void __user *)regs->tpc; info.si_trapno =0 ; - info.si_code =FPE_FIXME ; + info.si_code =FPE_FLTUNK ;if ((fsr &0x1c000 ) = (1 <<14 )) {if (fsr &0x10 ) info.si_code =FPE_FLTINV ;
Signature · 1 line
ldv
David Miller
maintainerFrom: "Dmitry V. Levin" <[email protected]>
Date: Fri, 13 Apr 2018 17:19:02 +0300
Quoted 13 lines
Starting with commit v4.14-rc1~60^2^2~1, a SIGFPE signal sent via kill results to wrong values in
si_pidandsi_uidfields of compatsiginfo_t.This happens due to
FPE_FIXMEbeing defined to 0 for sparc, and at the same timesiginfo_layout()introduced by the same commit returnsSIL_FAULTfor SIGFPE ifsi_code=SI_USERandFPE_FIXMEis defined to 0.Fix this regression by removing
FPE_FIXMEmacro and changing all its users to assignFPE_FLTUNKtosi_codeinstead ofFPE_FIXME.Note that
FPE_FLTUNKis a new macro introduced by commit266da65e9156d93e1126e185259a4aae68188d0e.
Quoted 8 lines
Tested with commit v4.16-11958-g16e205cf42da.
This bug was found by strace test suite.
Fixes cc731525f26a ("signal: Remove kernel interal si_code magic")Thanks-to: Anatoly Pugachev <[email protected]>
Signed-off-by Dmitry V. Levin <[email protected]>
Applied and queued up for -stable, thank you.