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

Commit 7037bd80 authored by Matt Fleming's avatar Matt Fleming Committed by Guan Xuetao
Browse files

unicore32: Use set_current_blocked() 



As described in 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.

Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Acked-by: default avatarGuan Xuetao <gxt@mprc.pku.edu.cn>
parent a50e4213

arch/unicore32/kernel/signal.c

+5 −10
Original line number Diff line number Diff line
@@ -63,10 +63,7 @@ static int restore_sigframe(struct pt_regs *regs, struct sigframe __user *sf) 
	err = __copy_from_user(&set, &sf->uc.uc_sigmask, sizeof(set));

	if (err == 0) {

		sigdelsetmask(&set, ~_BLOCKABLE);

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

		current->blocked = set;

		recalc_sigpending();

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

		set_current_blocked(&set);

	}



	err |= __get_user(regs->UCreg_00, &sf->uc.uc_mcontext.regs.UCreg_00);
@@ -321,6 +318,7 @@ static int handle_signal(unsigned long sig, struct k_sigaction *ka, 
{

	struct thread_info *thread = current_thread_info();

	struct task_struct *tsk = current;

	sigset_t blocked;

	int usig = sig;

	int ret;
@@ -372,13 +370,10 @@ static int handle_signal(unsigned long sig, struct k_sigaction *ka, 
	/*

	 * Block the signal if we were successful.

	 */

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

	sigorsets(&tsk->blocked, &tsk->blocked,

		  &ka->sa.sa_mask);

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

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

		sigaddset(&tsk->blocked, sig);

	recalc_sigpending();

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

		sigaddset(&blocked, sig);

	set_current_blocked(&blocked);



	return 0;

}