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 RESEND 09/11] signals: disallow_signal() should flush the potentially pending signal
Date: Mon, 14 Apr 2014 17:20:18 +0200 [thread overview]
Message-ID: <20140414152018.GA22022@redhat.com> (raw)
In-Reply-To: <20140414151929.GA21470@redhat.com>
disallow_signal() simply sets SIG_IGN, this is not enough and
recalc_sigpending() is simply pointless because in can never
change the state of TIF_SIGPENDING.
If we ignore a signal, we also need to do flush_sigqueue_mask() for
the case when this signal is pending, this way recalc_sigpending()
can actually clear TIF_SIGPENDING and we do not "leak" the allocated
siginfo's.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---
kernel/signal.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/kernel/signal.c b/kernel/signal.c
index 3eec27b..4bab1b7 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -3084,8 +3084,15 @@ EXPORT_SYMBOL(allow_signal);
void disallow_signal(int sig)
{
+ sigset_t mask;
+
+ sigemptyset(&mask);
+ sigaddset(&mask, sig);
+
spin_lock_irq(¤t->sighand->siglock);
current->sighand->action[(sig)-1].sa.sa_handler = SIG_IGN;
+ flush_sigqueue_mask(&mask, ¤t->signal->shared_pending);
+ flush_sigqueue_mask(&mask, ¤t->pending);
recalc_sigpending();
spin_unlock_irq(¤t->sighand->siglock);
}
--
1.5.5.1
next prev parent reply other threads:[~2014-04-14 15:45 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20140414151929.GA21470@redhat.com>
2014-04-14 15:19 ` [PATCH RESEND 04/11] signals: rename rm_from_queue_full() to flush_sigqueue_mask() Oleg Nesterov
2014-04-14 22:02 ` Andrew Morton
2014-04-15 7:40 ` Peter Zijlstra
2014-04-15 7:45 ` Andrew Morton
2014-04-15 18:28 ` Oleg Nesterov
2014-04-14 15:20 ` [PATCH RESEND 05/11] signals: cleanup the usage of t/current in do_sigaction() Oleg Nesterov
2014-04-14 15:20 ` [PATCH RESEND 06/11] signals: mv {dis,}allow_signal() from sched.h/exit.c to signal.[ch] Oleg Nesterov
2014-04-14 15:20 ` [PATCH RESEND 07/11] signals: jffs2: fix the wrong usage of disallow_signal() Oleg Nesterov
2014-04-14 22:09 ` Andrew Morton
2014-04-14 15:20 ` [PATCH RESEND 08/11] signals: kill the obsolete sigdelset() and recalc_sigpending() in allow_signal() Oleg Nesterov
2014-04-14 15:20 ` Oleg Nesterov [this message]
2014-04-14 15:20 ` [PATCH RESEND 10/11] signals: introduce kernel_sigaction() Oleg Nesterov
2014-04-14 15:20 ` [PATCH RESEND 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=20140414152018.GA22022@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.