diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2019-05-15 12:29:52 -0500 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2019-10-31 22:14:51 +0000 |
| commit | 73a9a357fa49fa39f7e45e6e03077efaf5253233 (patch) | |
| tree | a3dceecc36e6ec8f9517b840ab219b20f17c086a /kernel | |
| parent | 9b5ca7c1bb9fac115a2ea7483f38cde21b88eb28 (diff) | |
| download | linux-stable-73a9a357fa49fa39f7e45e6e03077efaf5253233.tar.gz linux-stable-73a9a357fa49fa39f7e45e6e03077efaf5253233.tar.bz2 linux-stable-73a9a357fa49fa39f7e45e6e03077efaf5253233.zip | |
signal/pid_namespace: Fix reboot_pid_ns to use send_sig not force_sig
commit f9070dc94542093fd516ae4ccea17ef46a4362c5 upstream.
The locking in force_sig_info is not prepared to deal with a task that
exits or execs (as sighand may change). The is not a locking problem
in force_sig as force_sig is only built to handle synchronous
exceptions.
Further the function force_sig_info changes the signal state if the
signal is ignored, or blocked or if SIGNAL_UNKILLABLE will prevent the
delivery of the signal. The signal SIGKILL can not be ignored and can
not be blocked and SIGNAL_UNKILLABLE won't prevent it from being
delivered.
So using force_sig rather than send_sig for SIGKILL is confusing
and pointless.
Because it won't impact the sending of the signal and and because
using force_sig is wrong, replace force_sig with send_sig.
Cc: Daniel Lezcano <daniel.lezcano@free.fr>
Cc: Serge Hallyn <serge@hallyn.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Fixes: cf3f89214ef6 ("pidns: add reboot_pid_ns() to handle the reboot syscall")
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/pid_namespace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c index d550f930027c..685c6a05e192 100644 --- a/kernel/pid_namespace.c +++ b/kernel/pid_namespace.c @@ -304,7 +304,7 @@ int reboot_pid_ns(struct pid_namespace *pid_ns, int cmd) } read_lock(&tasklist_lock); - force_sig(SIGKILL, pid_ns->child_reaper); + send_sig(SIGKILL, pid_ns->child_reaper, 1); read_unlock(&tasklist_lock); do_exit(0); |