pid_ns: zap_pid_ns_processes: use SEND_SIG_NOINFO instead of force_sig()
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 pid_ns: zap_pid_ns_processes: use SEND_SIG_NOINFO instead of force_sig()
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.
---
kernel/pid_namespace.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
kernel/pid_namespace.c renamed from kernel/pid_namespace.c~NS_DONT_ABUSE_FORCE +3 -4
@@ -161,13 +161,12 @@ void zap_pid_ns_processes(struct pid_namrcu_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 ();
Quoted 11 lines · Oleg Nesterov
zap_pid_ns_processes()usesforce_sig(SIGKILL)to ensure SIGKILL will be delivered to sub-namespace inits as well. This is correct, but we are going to changeforce_sig_info()semantics. See http://bugzilla.kernel.org/show_bug.cgi?id=15395#c31We can use
send_sig_info(SEND_SIG_NOINFO)instead, since614c517d7c00af1b26ded20646b329397d6f51a1SEND_SIG_NOINFOmeans "from user" and thereforesend_signal()will get the correctfrom_ancestor_ns= T flag.Signed-off-by Oleg Nesterov <[email protected]>
Justification makes sense, and (in some superficial testing, killing some nested pid_ns's) the patch seems to do the right thing.
Quoted 24 lines
---
kernel/pid_namespace.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)kernel/pid_namespace.c renamed from kernel/pid_namespace.c~NS_DONT_ABUSE_FORCE +3
-4@@ -161,13 +161,12 @@ void zap_pid_ns_processes(struct pid_namrcu_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 ();
Quoted 6 lines · Oleg Nesterov
zap_pid_ns_processes()usesforce_sig(SIGKILL)to ensure SIGKILL will be delivered to sub-namespace inits as well. This is correct, but we are going to changeforce_sig_info()semantics. See http://bugzilla.kernel.org/show_bug.cgi?id=15395#c31
Quoted 6 lines
We can use
send_sig_info(SEND_SIG_NOINFO)instead, since614c517d7c00af1b26ded20646b329397d6f51a1SEND_SIG_NOINFOmeans "from user" and thereforesend_signal()will get the correctfrom_ancestor_ns= T flag.Signed-off-by Oleg Nesterov <[email protected]>
Linus