From: Oleg Nesterov <oleg@redhat.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Roland McGrath <roland@redhat.com>,
wylda@volny.cz, gregkh@suse.de, jkosina@suse.cz,
Linus Torvalds <torvalds@linux-foundation.org>,
Sukadev Bhattiprolu <sukadev@us.ibm.com>,
Serge Hallyn <serue@us.ibm.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH] pid_ns: zap_pid_ns_processes: use SEND_SIG_NOINFO instead of force_sig()
Date: Wed, 3 Mar 2010 21:26:50 +0100 [thread overview]
Message-ID: <20100303202650.GA15521@redhat.com> (raw)
In-Reply-To: <20100303193003.GA10734@redhat.com>
zap_pid_ns_processes() uses force_sig(SIGKILL) to ensure SIGKILL
will be delivered to sub-namespace inits as well. This is correct,
but we are going to change force_sig_info() semantics.
See http://bugzilla.kernel.org/show_bug.cgi?id=15395#c31
We can use send_sig_info(SEND_SIG_NOINFO) instead, since
614c517d7c00af1b26ded20646b329397d6f51a1 SEND_SIG_NOINFO means
"from user" and therefore send_signal() will get the correct
from_ancestor_ns = T flag.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---
kernel/pid_namespace.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
--- mm/kernel/pid_namespace.c~NS_DONT_ABUSE_FORCE 2010-02-25 15:22:13.000000000 +0100
+++ mm/kernel/pid_namespace.c 2010-03-03 20:58:12.000000000 +0100
@@ -161,13 +161,12 @@ void zap_pid_ns_processes(struct pid_nam
rcu_read_lock();
/*
- * Use force_sig() since it clears SIGNAL_UNKILLABLE ensuring
- * any nested-container's init processes don't ignore the
- * signal
+ * Any nested-container's init processes won't ignore the
+ * SEND_SIG_NOINFO signal, see send_signal()->si_fromuser().
*/
task = pid_task(find_vpid(nr), PIDTYPE_PID);
if (task)
- force_sig(SIGKILL, task);
+ send_sig_info(SIGKILL, SEND_SIG_NOINFO, task);
rcu_read_unlock();
next parent reply other threads:[~2010-03-03 20:28 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <alpine.LFD.2.00.1003021136400.3616@localhost.localdomain>
[not found] ` <20100302201646.GA10734@redhat.com>
[not found] ` <alpine.LFD.2.00.1003021223060.3616@localhost.localdomain>
[not found] ` <20100303013227.4FFDE89EB@magilla.sf.frob.com>
[not found] ` <alpine.LFD.2.00.1003021740560.3616@localhost.localdomain>
[not found] ` <20100303112343.B89802F@magilla.sf.frob.com>
[not found] ` <alpine.LFD.2.00.1003030930100.3627@localhost.localdomain>
[not found] ` <20100303184412.GA7816@redhat.com>
[not found] ` <alpine.LFD.2.00.1003031053050.3599@localhost.localdomain>
[not found] ` <20100303193003.GA10734@redhat.com>
2010-03-03 20:26 ` Oleg Nesterov [this message]
2010-03-04 7:20 ` [PATCH] pid_ns: zap_pid_ns_processes: use SEND_SIG_NOINFO instead of force_sig() Serge E. Hallyn
2010-03-04 16:06 ` Linus Torvalds
2010-03-04 20:48 ` Roland McGrath
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=20100303202650.GA15521@redhat.com \
--to=oleg@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=gregkh@suse.de \
--cc=jkosina@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=roland@redhat.com \
--cc=serue@us.ibm.com \
--cc=sukadev@us.ibm.com \
--cc=torvalds@linux-foundation.org \
--cc=wylda@volny.cz \
/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.