Commit 593bde4c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'parisc-for-6.15-rc5' of... 

Merge tag 'parisc-for-6.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

Pull parisc fix from Helge Deller:
 "Fix a double SIGFPE crash"

* tag 'parisc-for-6.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Fix double SIGFPE crash
parents 081bc61f de3629ba

arch/parisc/math-emu/driver.c

+13 −3
Original line number Diff line number Diff line
@@ -97,7 +97,17 @@ handle_fpe(struct pt_regs *regs) 


	memcpy(regs->fr, frcopy, sizeof regs->fr);

	if (signalcode != 0) {

	    force_sig_fault(signalcode >> 24, signalcode & 0xffffff,

		int sig = signalcode >> 24;



		if (sig == SIGFPE) {

			/*

			 * Clear floating point trap bit to avoid trapping

			 * again on the first floating-point instruction in

			 * the userspace signal handler.

			 */

			regs->fr[0] &= ~(1ULL << 38);

		}

		force_sig_fault(sig, signalcode & 0xffffff,

				(void __user *) regs->iaoq[0]);

		return -1;

	}