From: Ben Hutchings Date: Thu, 27 Aug 2020 16:47:36 +0000 Subject: [PATCH] sparc32: signal: Fix stack trampoline for RT signals Message-Id: <20200827164736.GA3193046@decadent.org.uk> MIME-Version: 1 Content-Type: multipart/mixed; boundary="45Z9DzgjV8m4Oswq" List-Id: To: sparclinux@vger.kernel.org --45Z9DzgjV8m4Oswq Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable The stack trampoline generated by the sparc32 native version of setup_rt_frame() calls sigreturn(), not rt_sigreturn(). This will crash the task if it's ever used. (glibc sets its own restorer, so was not affected.) The sparc64 compat implementation has the right syscall number. This is untested; I have no way to run a sparc32 kernel. Signed-off-by: Ben Hutchings --- arch/sparc/kernel/signal_32.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/sparc/kernel/signal_32.c b/arch/sparc/kernel/signal_32.c index 3b005b6c3e0f..c85654cdc2c5 100644 --- a/arch/sparc/kernel/signal_32.c +++ b/arch/sparc/kernel/signal_32.c @@ -401,8 +401,8 @@ static int setup_rt_frame(struct ksignal *ksig, struct = pt_regs *regs, else { regs->u_regs[UREG_I7] =3D (unsigned long)(&(sf->insns[0]) - 2); =20 - /* mov __NR_sigreturn, %g1 */ - err |=3D __put_user(0x821020d8, &sf->insns[0]); + /* mov __NR_rt_sigreturn, %g1 */ + err |=3D __put_user(0x82102065, &sf->insns[0]); =20 /* t 0x10 */ err |=3D __put_user(0x91d02010, &sf->insns[1]); --45Z9DzgjV8m4Oswq Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEErCspvTSmr92z9o8157/I7JWGEQkFAl9H46MACgkQ57/I7JWG EQnaYw//WB04G2UJ78nGVx0JKfeySRcWvm0tAUL2WsQpr4PLSk5JKQfwqrBtcjds R8c17/rMyP99xrYFcndH8raqJVRxxhRxd5sIDI8I+jXOh3UGXmEs7arBR9m0k071 pNcRQCiZW75l/cCxZH1y8lHl5JGP98FvXS6GO0VyjhdOUYJvv1ipGwU+7FqTYCyF UDvYvIOomofLTBQQtZim5ncn3IbjVWigjhM/QB4t4+3WBtE52tE35BeN0/xKz6vo R0EvGAmKyVbWChlcHFS5Lon5m3wNdXMjyaGOgRvbcGua6E4oSahdO7Fm4qFKBNyi f36vCDibGrL6YkxLBOnuCbIEA4PNo1bjdqbLdDCg2YxsjAUENd7ALFXca4MFYKa+ RFBpceI7LCgJibRIqRrOjKs5RZNFwzR3TDvKgoEsMM3k/kQzs9NeTVIFvfMoBDTM ik7YCUSJghTGbwcSR3pTcSa3wlKssdc3x7A6MhHQPAccrhsxlcnUwS+sAel0FY/n 7AymVdc6ZZvXWyuNB4RlR0gpUUw42ltmXg0ypdKYzX4RIhru1zIUgORRBRve/beZ yW5hDO2R/di6ZDcXLaf0KsBPSckvhkW5sPPx83iH8yMYHaw1RMJbloSxXH4bLuFv swXVSzj3pDF2MGlYXp4FTjylFUBE6rVha0MCVHYa1vIoRgba9ug= =FEtO -----END PGP SIGNATURE----- --45Z9DzgjV8m4Oswq--