Commit 0099852f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of https://github.com/openrisc/linux 

Pull OpenRISC fix from Stafford Horne:

 - During the 6.4 cycle my fpu support work broke ABI compatibility in
   the sigcontext struct. This was noticed by musl libc developers after
   the release. This fix restores the ABI.

* tag 'for-linus' of https://github.com/openrisc/linux:
  openrisc: Union fpcsr and oldmask in sigcontext to unbreak userspace ABI
parents eb26cbb1 dceaafd6

arch/openrisc/include/uapi/asm/sigcontext.h

+4 −2
Original line number Diff line number Diff line
@@ -28,8 +28,10 @@ 


struct sigcontext {

	struct user_regs_struct regs;  /* needs to be first */

	struct __or1k_fpu_state fpu;

	unsigned long oldmask;

	union {

		unsigned long fpcsr;

		unsigned long oldmask;	/* unused */

	};

};



#endif /* __ASM_OPENRISC_SIGCONTEXT_H */

arch/openrisc/kernel/signal.c

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static int restore_sigcontext(struct pt_regs *regs, 
	err |= __copy_from_user(regs, sc->regs.gpr, 32 * sizeof(unsigned long));

	err |= __copy_from_user(&regs->pc, &sc->regs.pc, sizeof(unsigned long));

	err |= __copy_from_user(&regs->sr, &sc->regs.sr, sizeof(unsigned long));

	err |= __copy_from_user(&regs->fpcsr, &sc->fpu.fpcsr, sizeof(unsigned long));

	err |= __copy_from_user(&regs->fpcsr, &sc->fpcsr, sizeof(unsigned long));



	/* make sure the SM-bit is cleared so user-mode cannot fool us */

	regs->sr &= ~SPR_SR_SM;
@@ -113,7 +113,7 @@ static int setup_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc) 
	err |= __copy_to_user(sc->regs.gpr, regs, 32 * sizeof(unsigned long));

	err |= __copy_to_user(&sc->regs.pc, &regs->pc, sizeof(unsigned long));

	err |= __copy_to_user(&sc->regs.sr, &regs->sr, sizeof(unsigned long));

	err |= __copy_to_user(&sc->fpu.fpcsr, &regs->fpcsr, sizeof(unsigned long));

	err |= __copy_to_user(&sc->fpcsr, &regs->fpcsr, sizeof(unsigned long));



	return err;

}