Skip to content

Commit de3629b

Browse files
committed
parisc: Fix double SIGFPE crash
Camm noticed that on parisc a SIGFPE exception will crash an application with a second SIGFPE in the signal handler. Dave analyzed it, and it happens because glibc uses a double-word floating-point store to atomically update function descriptors. As a result of lazy binding, we hit a floating-point store in fpe_func almost immediately. When the T bit is set, an assist exception trap occurs when when the co-processor encounters *any* floating-point instruction except for a double store of register %fr0. The latter cancels all pending traps. Let's fix this by clearing the Trap (T) bit in the FP status register before returning to the signal handler in userspace. The issue can be reproduced with this test program: root@parisc:~# cat fpe.c static void fpe_func(int sig, siginfo_t *i, void *v) { sigset_t set; sigemptyset(&set); sigaddset(&set, SIGFPE); sigprocmask(SIG_UNBLOCK, &set, NULL); printf("GOT signal %d with si_code %ld\n", sig, i->si_code); } int main() { struct sigaction action = { .sa_sigaction = fpe_func, .sa_flags = SA_RESTART|SA_SIGINFO }; sigaction(SIGFPE, &action, 0); feenableexcept(FE_OVERFLOW); return printf("%lf\n",1.7976931348623158E308*1.7976931348623158E308); } root@parisc:~# gcc fpe.c -lm root@parisc:~# ./a.out Floating point exception root@parisc:~# strace -f ./a.out execve("./a.out", ["./a.out"], 0xf9ac7034 /* 20 vars */) = 0 getrlimit(RLIMIT_STACK, {rlim_cur=8192*1024, rlim_max=RLIM_INFINITY}) = 0 ... rt_sigaction(SIGFPE, {sa_handler=0x1110a, sa_mask=[], sa_flags=SA_RESTART|SA_SIGINFO}, NULL, 8) = 0 --- SIGFPE {si_signo=SIGFPE, si_code=FPE_FLTOVF, si_addr=0x1078f} --- --- SIGFPE {si_signo=SIGFPE, si_code=FPE_FLTOVF, si_addr=0xf8f21237} --- +++ killed by SIGFPE +++ Floating point exception Signed-off-by: Helge Deller <[email protected]> Suggested-by: John David Anglin <[email protected]> Reported-by: Camm Maguire <[email protected]> Cc: [email protected]
1 parent 38fec10 commit de3629b

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

arch/parisc/math-emu/driver.c

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,19 @@ handle_fpe(struct pt_regs *regs)
9797

9898
memcpy(regs->fr, frcopy, sizeof regs->fr);
9999
if (signalcode != 0) {
100-
force_sig_fault(signalcode >> 24, signalcode & 0xffffff,
101-
(void __user *) regs->iaoq[0]);
102-
return -1;
100+
int sig = signalcode >> 24;
101+
102+
if (sig == SIGFPE) {
103+
/*
104+
* Clear floating point trap bit to avoid trapping
105+
* again on the first floating-point instruction in
106+
* the userspace signal handler.
107+
*/
108+
regs->fr[0] &= ~(1ULL << 38);
109+
}
110+
force_sig_fault(sig, signalcode & 0xffffff,
111+
(void __user *) regs->iaoq[0]);
112+
return -1;
103113
}
104114

105115
return signalcode ? -1 : 0;

0 commit comments

Comments
 (0)