Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e071e2b authored by Al Viro's avatar Al Viro Committed by Paul Mundt
Browse files

sh: Fix up TIF_NOTIFY_RESUME sans TIF_SIGPENDING handling. 



As Al notes, we missed a TIF_NOTIFY_RESUME check which caused any
handlers without TIF_SIGPENDING also set to skip the notification:

	Looks like while it is in the relevant masks *and* checked in
	do_notify_resume() both on 32bit and 64bit variants since commit
	ab99c733 ("sh: Make syscall tracer
	use tracehook notifiers, add TIF_NOTIFY_RESUME.") they are
	actually *not* reached without simulataneous SIGPENDING, since
	the actual glue in the callers had not been updated back then and
	still checks for _TIF_SIGPENDING alone when deciding whether to
	hit do_notify_resume() or not.

Reported-by: default avatarNobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Tested-by: default avatarNobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 077664a2

arch/sh/kernel/cpu/sh5/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -933,7 +933,7 @@ ret_with_reschedule: 


	pta	restore_all, tr1



	movi	_TIF_SIGPENDING, r8

	movi	(_TIF_SIGPENDING|_TIF_NOTIFY_RESUME), r8

	and	r8, r7, r8

	pta	work_notifysig, tr0

	bne	r8, ZERO, tr0

arch/sh/kernel/entry-common.S

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ work_pending: 
	! r8: current_thread_info

	! t:  result of "tst	#_TIF_NEED_RESCHED, r0"

	bf/s	work_resched

	 tst	#_TIF_SIGPENDING, r0

	 tst	#(_TIF_SIGPENDING | _TIF_NOTIFY_RESUME), r0

work_notifysig:

	bt/s	__restore_all

	 mov	r15, r4