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

Commit e6a58580 authored by Oleg Nesterov's avatar Oleg Nesterov
Browse files

x86: signal: handle_signal() should use set_current_blocked() 



This is ugly, but if sigprocmask() needs retarget_shared_pending() then
handle signal should follow this logic. In theory it is newer correct to
add the new signals to current->blocked, the signal handler can sleep/etc
so we should notify other threads in case we block the pending signal and
nobody else has TIF_SIGPENDING.

Of course, this change doesn't make signals faster :/

Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Reviewed-by: default avatarMatt Fleming <matt.fleming@linux.intel.com>
Acked-by: default avatarTejun Heo <tj@kernel.org>
parent e6fa16ab

arch/x86/kernel/signal.c

+4 −5
Original line number Diff line number Diff line
@@ -682,6 +682,7 @@ static int 
handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,

	      sigset_t *oldset, struct pt_regs *regs)

{

	sigset_t blocked;

	int ret;



	/* Are we from a system call? */
@@ -741,12 +742,10 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka, 
	 */

	regs->flags &= ~X86_EFLAGS_TF;



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

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

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

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

		sigaddset(&current->blocked, sig);

	recalc_sigpending();

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

		sigaddset(&blocked, sig);

	set_current_blocked(&blocked);



	tracehook_signal_handler(sig, info, ka, regs,

				 test_thread_flag(TIF_SINGLESTEP));