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

Commit 77097ae5 authored by Al Viro's avatar Al Viro
Browse files

most of set_current_blocked() callers want SIGKILL/SIGSTOP removed from set 



Only 3 out of 63 do not.  Renamed the current variant to __set_current_blocked(),
added set_current_blocked() that will exclude unblockable signals, switched
open-coded instances to it.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent edd63a27

arch/alpha/kernel/signal.c

+0 −2
Original line number Diff line number Diff line
@@ -226,7 +226,6 @@ do_sigreturn(struct sigcontext __user *sc, struct pt_regs *regs, 
	if (__get_user(set.sig[0], &sc->sc_mask))

		goto give_sigsegv;



	sigdelsetmask(&set, ~_BLOCKABLE);

	set_current_blocked(&set);



	if (restore_sigcontext(sc, regs, sw))
@@ -261,7 +260,6 @@ do_rt_sigreturn(struct rt_sigframe __user *frame, struct pt_regs *regs, 
	if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set)))

		goto give_sigsegv;



	sigdelsetmask(&set, ~_BLOCKABLE);

	set_current_blocked(&set);



	if (restore_sigcontext(&frame->uc.uc_mcontext, regs, sw))

arch/arm/kernel/signal.c

+1 −5
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 


#include "signal.h"



#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))



/*

 * For ARM syscalls, we encode the syscall number into the instruction.

 */
@@ -210,10 +208,8 @@ static int restore_sigframe(struct pt_regs *regs, struct sigframe __user *sf) 
	int err;



	err = __copy_from_user(&set, &sf->uc.uc_sigmask, sizeof(set));

	if (err == 0) {

		sigdelsetmask(&set, ~_BLOCKABLE);

	if (err == 0)

		set_current_blocked(&set);

	}



	__get_user_error(regs->ARM_r0, &sf->uc.uc_mcontext.arm_r0, err);

	__get_user_error(regs->ARM_r1, &sf->uc.uc_mcontext.arm_r1, err);

arch/avr32/kernel/signal.c

+0 −3
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 
#include <asm/ucontext.h>

#include <asm/syscalls.h>



#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))



asmlinkage int sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss,

			       struct pt_regs *regs)

{
@@ -89,7 +87,6 @@ asmlinkage int sys_rt_sigreturn(struct pt_regs *regs) 
	if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set)))

		goto badframe;



	sigdelsetmask(&set, ~_BLOCKABLE);

	set_current_blocked(&set);



	if (restore_sigcontext(regs, &frame->uc.uc_mcontext))

arch/blackfin/kernel/signal.c

+0 −3
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
#include <asm/fixed_code.h>

#include <asm/syscall.h>



#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))



/* Location of the trace bit in SYSCFG. */

#define TRACE_BITS 0x0001
@@ -98,7 +96,6 @@ asmlinkage int do_rt_sigreturn(unsigned long __unused) 
	if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set)))

		goto badframe;



	sigdelsetmask(&set, ~_BLOCKABLE);

	set_current_blocked(&set);



	if (rt_restore_sigcontext(regs, &frame->uc.uc_mcontext, &r0))

arch/c6x/kernel/signal.c

+0 −3
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 
#include <asm/cacheflush.h>





#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))



/*

 * Do a signal return, undo the signal stack.

 */
@@ -87,7 +85,6 @@ asmlinkage int do_rt_sigreturn(struct pt_regs *regs) 
	if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set)))

		goto badframe;



	sigdelsetmask(&set, ~_BLOCKABLE);

	set_current_blocked(&set);



	if (restore_sigcontext(regs, &frame->uc.uc_mcontext))