Commit d12f7c4a authored by Matt Fleming's avatar Matt Fleming Committed by Linus Torvalds
Browse files

xtensa: use set_current_blocked() and block_sigmask() 



As described in commit e6fa16ab ("signal: sigprocmask() should do
retarget_shared_pending()") the modification of current->blocked is
incorrect as we need to check whether the signal we're about to block is
pending in the shared queue.

Also, use the new helper function introduced in commit 5e6292c0
("signal: add block_sigmask() for adding sigmask to current->blocked")
which centralises the code for updating current->blocked after
successfully delivering a signal and reduces the amount of duplicate code
across architectures.  In the past some architectures got this code wrong,
so using this helper function should stop that from happening again.

Acked-by: default avatarOleg Nesterov <oleg@redhat.com>
Cc: Chris Zankel <chris@zankel.net>
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3785006a

arch/xtensa/kernel/signal.c

+3 −14
Original line number Original line Diff line number Diff line
@@ -260,10 +260,7 @@ asmlinkage long xtensa_rt_sigreturn(long a0, long a1, long a2, long a3, 
		goto badframe;

		goto badframe;





	sigdelsetmask(&set, ~_BLOCKABLE);

	sigdelsetmask(&set, ~_BLOCKABLE);

	spin_lock_irq(&current->sighand->siglock);

	set_current_blocked(&set);

	current->blocked = set;

	recalc_sigpending();

	spin_unlock_irq(&current->sighand->siglock);





	if (restore_sigcontext(regs, frame))

	if (restore_sigcontext(regs, frame))

		goto badframe;

		goto badframe;
@@ -448,11 +445,8 @@ asmlinkage long xtensa_rt_sigsuspend(sigset_t __user *unewset, 
		return -EFAULT;

		return -EFAULT;





	sigdelsetmask(&newset, ~_BLOCKABLE);

	sigdelsetmask(&newset, ~_BLOCKABLE);

	spin_lock_irq(&current->sighand->siglock);

	saveset = current->blocked;

	saveset = current->blocked;

	current->blocked = newset;

	set_current_blocked(&newset);

	recalc_sigpending();

	spin_unlock_irq(&current->sighand->siglock);





	regs->areg[2] = -EINTR;

	regs->areg[2] = -EINTR;

	while (1) {

	while (1) {
@@ -539,12 +533,7 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset) 
		if (ret)

		if (ret)

			return ret;

			return ret;





		spin_lock_irq(&current->sighand->siglock);

		block_sigmask(&ka, signr);

		sigorsets(&current->blocked, &current->blocked, &ka.sa.sa_mask);

		if (!(ka.sa.sa_flags & SA_NODEFER))

			sigaddset(&current->blocked, signr);

		recalc_sigpending();

		spin_unlock_irq(&current->sighand->siglock);

		if (current->ptrace & PT_SINGLESTEP)

		if (current->ptrace & PT_SINGLESTEP)

			task_pt_regs(current)->icountlevel = 1;

			task_pt_regs(current)->icountlevel = 1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE