Commit dceaafd6 authored by Stafford Horne's avatar Stafford Horne
Browse files

openrisc: Union fpcsr and oldmask in sigcontext to unbreak userspace ABI 



With commit 27267655 ("openrisc: Support floating point user api") I
added an entry to the struct sigcontext which caused an unwanted change
to the userspace ABI.

To fix this we use the previously unused oldmask field space for the
floating point fpcsr state.  We do this with a union to restore the ABI
back to the pre kernel v6.4 ABI and keep API compatibility.

This does mean if there is some code somewhere that is setting oldmask
in an OpenRISC specific userspace sighandler it would end up setting the
floating point register status, but I think it's unlikely as oldmask was
never functional before.

Fixes: 27267655 ("openrisc: Support floating point user api")
Reported-by: default avatarSzabolcs Nagy <nsz@port70.net>
Closes: https://lore.kernel.org/openrisc/20230626213840.GA1236108@port70.net/


Signed-off-by: default avatarStafford Horne <shorne@gmail.com>
parent 45a3e24f

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;

}