hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

signals: set_current_blocked() can use __set_current_blocked() 

Cleanup.  And I think we need more cleanups, in particular
__set_current_blocked() and sigprocmask() should die.  Nobody should
ever block SIGKILL or SIGSTOP.

 - Change set_current_blocked() to use __set_current_blocked()

 - Change sys_sigprocmask() to use set_current_blocked(), this way it
   should not worry about SIGKILL/SIGSTOP.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Oleg Nesterov 2013-01-05 19:13:29 +01:00 committed by Linus Torvalds
parent 5ba53ff648
commit 0c4a842349
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/signal.c
View File

@ -2528,11 +2528,8 @@ static void __set_task_blocked(struct task_struct *tsk, const sigset_t *newset)
*/ */
void set_current_blocked(sigset_t *newset) void set_current_blocked(sigset_t *newset)
{ {
struct task_struct *tsk = current;
sigdelsetmask(newset, sigmask(SIGKILL) | sigmask(SIGSTOP)); sigdelsetmask(newset, sigmask(SIGKILL) | sigmask(SIGSTOP));
spin_lock_irq(&tsk->sighand->siglock); __set_current_blocked(newset);
__set_task_blocked(tsk, newset);
spin_unlock_irq(&tsk->sighand->siglock);
} }
void __set_current_blocked(const sigset_t *newset) void __set_current_blocked(const sigset_t *newset)
@ -3204,7 +3201,6 @@ SYSCALL_DEFINE3(sigprocmask, int, how, old_sigset_t __user *, nset,
if (nset) { if (nset) {
if (copy_from_user(&new_set, nset, sizeof(*nset))) if (copy_from_user(&new_set, nset, sizeof(*nset)))
return -EFAULT; return -EFAULT;
new_set &= ~(sigmask(SIGKILL) | sigmask(SIGSTOP));
new_blocked = current->blocked; new_blocked = current->blocked;
@ -3222,7 +3218,7 @@ SYSCALL_DEFINE3(sigprocmask, int, how, old_sigset_t __user *, nset,
return -EINVAL; return -EINVAL;
} }
__set_current_blocked(&new_blocked); set_current_blocked(&new_blocked);
} }
if (oset) { if (oset) {