signals: mv {dis,}allow_signal() from sched.h/exit.c to signal.[ch]

Move the declaration/definition of allow_signal/disallow_signal to
signal.h/signal.c.  The new place is more logical and allows to use the
static helpers in signal.c (see the next changes).

While at it, make them return void and remove the valid_signal() check.
Nobody checks the returned value, and in-kernel users must not pass the
wrong signal number.

Signed-off-by: Oleg Nesterov <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Al Viro <[email protected]>
Cc: David Woodhouse <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: Geert Uytterhoeven <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Mathieu Desnoyers <[email protected]>
Cc: Richard Weinberger <[email protected]>
Cc: Steven Rostedt <[email protected]>
Cc: Tejun Heo <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 8fcd0e6098d961e5b95c45f702c46ca099eebd1b..ea74596014a2175b4e379bb955096f386819227e 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -2414,9 +2414,6 @@ extern void flush_itimer_signals(void);
 
 extern void do_group_exit(int);
 
-extern int allow_signal(int);
-extern int disallow_signal(int);
-
 extern int do_execve(struct filename *,
                     const char __user * const __user *,
                     const char __user * const __user *);

diff --git a/include/linux/signal.h b/include/linux/signal.h
index ae744c314630c9a0ee2167e6381a4f1042cab364..ac83c593f4b96b88a5fd797d0abbc697625103ee 100644 (file)
--- a/include/linux/signal.h
+++ b/include/linux/signal.h
@@ -284,6 +284,8 @@ extern int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka,
 extern void signal_setup_done(int failed, struct ksignal *ksig, int stepping);
 extern void signal_delivered(int sig, siginfo_t *info, struct k_sigaction *ka, struct pt_regs *regs, int stepping);
 extern void exit_signals(struct task_struct *tsk);
+extern void allow_signal(int);
+extern void disallow_signal(int);
 
 /*
  * Eventually that'll replace get_signal_to_deliver(); macro for now,

diff --git a/kernel/exit.c b/kernel/exit.c
index 750c2e5946170fbc07f102a18db8334f036d9f78..e5c4668f1799d15ce1d527b1e357d795f3d748ea 100644 (file)
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -313,45 +313,6 @@ kill_orphaned_pgrp(struct task_struct *tsk, struct task_struct *parent)
        }
 }
 
-/*
- * Let kernel threads use this to say that they allow a certain signal.
- * Must not be used if kthread was cloned with CLONE_SIGHAND.
- */
-int allow_signal(int sig)
-{
-       if (!valid_signal(sig) || sig < 1)
-               return -EINVAL;
-
-       spin_lock_irq(&current->sighand->siglock);
-       /* This is only needed for daemonize()'ed kthreads */
-       sigdelset(&current->blocked, sig);
-       /*
-        * Kernel threads handle their own signals. Let the signal code
-        * know it'll be handled, so that they don't get converted to
-        * SIGKILL or just silently dropped.
-        */
-       current->sighand->action[(sig)-1].sa.sa_handler = (void __user *)2;
-       recalc_sigpending();
-       spin_unlock_irq(&current->sighand->siglock);
-       return 0;
-}
-
-EXPORT_SYMBOL(allow_signal);
-
-int disallow_signal(int sig)
-{
-       if (!valid_signal(sig) || sig < 1)
-               return -EINVAL;
-
-       spin_lock_irq(&current->sighand->siglock);
-       current->sighand->action[(sig)-1].sa.sa_handler = SIG_IGN;
-       recalc_sigpending();
-       spin_unlock_irq(&current->sighand->siglock);
-       return 0;
-}
-
-EXPORT_SYMBOL(disallow_signal);
-
 #ifdef CONFIG_MEMCG
 /*
  * A task is exiting.   If it owned this mm, find a new owner for the mm.

diff --git a/kernel/signal.c b/kernel/signal.c
index a6d8c3af0ad6296f0e9c21da3bd22921f342723f..7d6ff8b185099f0a803cac82896834fe9c0bc641 100644 (file)
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -3066,6 +3066,35 @@ COMPAT_SYSCALL_DEFINE4(rt_tgsigqueueinfo,
 }
 #endif
 
+/*
+ * Let kernel threads use this to say that they allow a certain signal.
+ * Must not be used if kthread was cloned with CLONE_SIGHAND.
+ */
+void allow_signal(int sig)
+{
+       spin_lock_irq(&current->sighand->siglock);
+       /* This is only needed for daemonize()'ed kthreads */
+       sigdelset(&current->blocked, sig);
+       /*
+        * Kernel threads handle their own signals. Let the signal code
+        * know it'll be handled, so that they don't get converted to
+        * SIGKILL or just silently dropped.
+        */
+       current->sighand->action[(sig)-1].sa.sa_handler = (void __user *)2;
+       recalc_sigpending();
+       spin_unlock_irq(&current->sighand->siglock);
+}
+EXPORT_SYMBOL(allow_signal);
+
+void disallow_signal(int sig)
+{
+       spin_lock_irq(&current->sighand->siglock);
+       current->sighand->action[(sig)-1].sa.sa_handler = SIG_IGN;
+       recalc_sigpending();
+       spin_unlock_irq(&current->sighand->siglock);
+}
+EXPORT_SYMBOL(disallow_signal);
+
 int do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact)
 {
        struct task_struct *p = current, *t;