From: Oleg Nesterov <oleg@redhat.com>
To: Andrew Morton <akpm@linux-foundation.org>,
Peter Zijlstra <peterz@infradead.org>
Cc: Al Viro <viro@ZenIV.linux.org.uk>,
David Woodhouse <dwmw2@infradead.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Ingo Molnar <mingo@kernel.org>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
Richard Weinberger <richard@nod.at>,
Steven Rostedt <rostedt@goodmis.org>, Tejun Heo <tj@kernel.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH RESEND2 06/11] signals: mv {dis,}allow_signal() from sched.h/exit.c to signal.[ch]
Date: Tue, 15 Apr 2014 20:36:56 +0200 [thread overview]
Message-ID: <20140415183656.GA13416@redhat.com> (raw)
In-Reply-To: <20140415183625.GA13371@redhat.com>
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 <oleg@redhat.com>
---
include/linux/sched.h | 3 ---
include/linux/signal.h | 2 ++
kernel/exit.c | 39 ---------------------------------------
kernel/signal.c | 29 +++++++++++++++++++++++++++++
4 files changed, 31 insertions(+), 42 deletions(-)
diff --git a/include/linux/sched.h b/include/linux/sched.h
index a04214f..82fe3da 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -2360,9 +2360,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 ae744c3..ac83c59 100644
--- 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 6ed6a1d..ad7183a 100644
--- 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(¤t->sighand->siglock);
- /* This is only needed for daemonize()'ed kthreads */
- sigdelset(¤t->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(¤t->sighand->siglock);
- return 0;
-}
-
-EXPORT_SYMBOL(allow_signal);
-
-int disallow_signal(int sig)
-{
- if (!valid_signal(sig) || sig < 1)
- return -EINVAL;
-
- spin_lock_irq(¤t->sighand->siglock);
- current->sighand->action[(sig)-1].sa.sa_handler = SIG_IGN;
- recalc_sigpending();
- spin_unlock_irq(¤t->sighand->siglock);
- return 0;
-}
-
-EXPORT_SYMBOL(disallow_signal);
-
#ifdef CONFIG_MM_OWNER
/*
* 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 a58b0db..8a7ee44 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -3065,6 +3065,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(¤t->sighand->siglock);
+ /* This is only needed for daemonize()'ed kthreads */
+ sigdelset(¤t->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(¤t->sighand->siglock);
+}
+EXPORT_SYMBOL(allow_signal);
+
+void disallow_signal(int sig)
+{
+ spin_lock_irq(¤t->sighand->siglock);
+ current->sighand->action[(sig)-1].sa.sa_handler = SIG_IGN;
+ recalc_sigpending();
+ spin_unlock_irq(¤t->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;
--
1.5.5.1
next prev parent reply other threads:[~2014-04-15 18:48 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-15 18:36 [PATCH RESEND2 00/11] cleanup/fix allow_signal/disallow_signal Oleg Nesterov
2014-04-15 18:36 ` [PATCH RESEND2 01/11] signals: kill sigfindinword() Oleg Nesterov
2014-04-15 18:36 ` [PATCH RESEND2 02/11] signals: s/siginitset/sigemptyset/ in do_sigtimedwait() Oleg Nesterov
2014-04-15 18:36 ` [PATCH RESEND2 03/11] signals: kill rm_from_queue(), change prepare_signal() to use for_each_thread() Oleg Nesterov
2014-04-15 18:36 ` [PATCH RESEND2 04/11] signals: rename rm_from_queue_full() to flush_sigqueue_mask() Oleg Nesterov
2014-04-15 18:36 ` [PATCH RESEND2 05/11] signals: cleanup the usage of t/current in do_sigaction() Oleg Nesterov
2014-04-15 18:36 ` Oleg Nesterov [this message]
2014-04-15 18:36 ` [PATCH RESEND2 07/11] signals: jffs2: fix the wrong usage of disallow_signal() Oleg Nesterov
2014-04-15 18:37 ` [PATCH RESEND2 08/11] signals: kill the obsolete sigdelset() and recalc_sigpending() in allow_signal() Oleg Nesterov
2014-04-15 18:37 ` [PATCH RESEND2 09/11] signals: disallow_signal() should flush the potentially pending signal Oleg Nesterov
2014-04-15 18:37 ` [PATCH RESEND2 10/11] signals: introduce kernel_sigaction() Oleg Nesterov
2014-04-15 18:37 ` [PATCH RESEND2 11/11] signals: change wait_for_helper() to use kernel_sigaction() Oleg Nesterov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140415183656.GA13416@redhat.com \
--to=oleg@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=dwmw2@infradead.org \
--cc=fweisbec@gmail.com \
--cc=geert@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=richard@nod.at \
--cc=rostedt@goodmis.org \
--cc=tj@kernel.org \
--cc=viro@ZenIV.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox