|
 |
29d451 |
diff -Naur a/misc-utils/kill.1.adoc b/misc-utils/kill.1.adoc
|
|
|
29d451 |
--- a/misc-utils/kill.1.adoc 2022-02-13 23:49:01.403480088 -0800
|
|
|
29d451 |
+++ b/misc-utils/kill.1.adoc 2022-12-07 16:37:26.037765934 -0800
|
|
|
29d451 |
@@ -62,6 +62,8 @@
|
|
|
29d451 |
Do not restrict the command-name-to-PID conversion to processes with the same UID as the present process.
|
|
|
29d451 |
*-p*, *--pid*::
|
|
|
29d451 |
Only print the process ID (PID) of the named processes, do not send any signals.
|
|
|
29d451 |
+*-r*, *--require-handler*::
|
|
|
29d451 |
+Do not send the signal if it is not caught in userspace by the signalled process.
|
|
|
29d451 |
*--verbose*::
|
|
|
29d451 |
Print PID(s) that will be signaled with *kill* along with the signal.
|
|
|
29d451 |
*-q*, *--queue* _value_::
|
|
|
29d451 |
diff -Naur a/misc-utils/kill.c b/misc-utils/kill.c
|
|
|
29d451 |
--- a/misc-utils/kill.c 2022-02-13 23:49:01.403480088 -0800
|
|
|
29d451 |
+++ b/misc-utils/kill.c 2022-12-07 16:38:05.231013950 -0800
|
|
|
29d451 |
@@ -93,6 +93,7 @@
|
|
|
29d451 |
check_all:1,
|
|
|
29d451 |
do_kill:1,
|
|
|
29d451 |
do_pid:1,
|
|
|
29d451 |
+ require_handler:1,
|
|
|
29d451 |
use_sigval:1,
|
|
|
29d451 |
#ifdef UL_HAVE_PIDFD
|
|
|
29d451 |
timeout:1,
|
|
|
29d451 |
@@ -210,6 +211,7 @@
|
|
|
29d451 |
fputs(_(" -p, --pid print pids without signaling them\n"), out);
|
|
|
29d451 |
fputs(_(" -l, --list[=<signal>] list signal names, or convert a signal number to a name\n"), out);
|
|
|
29d451 |
fputs(_(" -L, --table list signal names and numbers\n"), out);
|
|
|
29d451 |
+ fputs(_(" -r, --require-handler do not send signal if signal handler is not present\n"), out);
|
|
|
29d451 |
fputs(_(" --verbose print pids that will be signaled\n"), out);
|
|
|
29d451 |
|
|
|
29d451 |
fputs(USAGE_SEPARATOR, out);
|
|
|
29d451 |
@@ -300,6 +302,10 @@
|
|
|
29d451 |
print_all_signals(stdout, 1);
|
|
|
29d451 |
exit(EXIT_SUCCESS);
|
|
|
29d451 |
}
|
|
|
29d451 |
+ if (!strcmp(arg, "-r") || !strcmp(arg, "--require-handler")) {
|
|
|
29d451 |
+ ctl->require_handler = 1;
|
|
|
29d451 |
+ continue;
|
|
|
29d451 |
+ }
|
|
|
29d451 |
if (!strcmp(arg, "-p") || !strcmp(arg, "--pid")) {
|
|
|
29d451 |
ctl->do_pid = 1;
|
|
|
29d451 |
if (ctl->do_kill)
|
|
|
29d451 |
@@ -446,6 +452,32 @@
|
|
|
29d451 |
return rc;
|
|
|
29d451 |
}
|
|
|
29d451 |
|
|
|
29d451 |
+static int check_signal_handler(const struct kill_control *ctl)
|
|
|
29d451 |
+{
|
|
|
29d451 |
+ uintmax_t sigcgt = 0;
|
|
|
29d451 |
+ int rc = 0, has_hnd = 0;
|
|
|
29d451 |
+ struct path_cxt *pc;
|
|
|
29d451 |
+
|
|
|
29d451 |
+ if (!ctl->require_handler)
|
|
|
29d451 |
+ return 1;
|
|
|
29d451 |
+
|
|
|
29d451 |
+ pc = ul_new_procfs_path(ctl->pid, NULL);
|
|
|
29d451 |
+ if (!pc)
|
|
|
29d451 |
+ return -ENOMEM;
|
|
|
29d451 |
+
|
|
|
29d451 |
+ rc = procfs_process_get_stat_nth(pc, 34, &sigcgt);
|
|
|
29d451 |
+ if (rc)
|
|
|
29d451 |
+ return -EINVAL;
|
|
|
29d451 |
+
|
|
|
29d451 |
+ ul_unref_path(pc);
|
|
|
29d451 |
+
|
|
|
29d451 |
+ has_hnd = ((1UL << (ctl->numsig - 1)) & sigcgt) != 0;
|
|
|
29d451 |
+ if (ctl->verbose && !has_hnd)
|
|
|
29d451 |
+ printf(_("not signalling pid %d, it has no userspace handler for signal %d\n"), ctl->pid, ctl->numsig);
|
|
|
29d451 |
+
|
|
|
29d451 |
+ return has_hnd;
|
|
|
29d451 |
+}
|
|
|
29d451 |
+
|
|
|
29d451 |
int main(int argc, char **argv)
|
|
|
29d451 |
{
|
|
|
29d451 |
struct kill_control ctl = { .numsig = SIGTERM };
|
|
|
29d451 |
@@ -468,6 +500,8 @@
|
|
|
29d451 |
errno = 0;
|
|
|
29d451 |
ctl.pid = strtol(ctl.arg, &ep, 10);
|
|
|
29d451 |
if (errno == 0 && ep && *ep == '\0' && ctl.arg < ep) {
|
|
|
29d451 |
+ if (check_signal_handler(&ctl) <= 0)
|
|
|
29d451 |
+ continue;
|
|
|
29d451 |
if (kill_verbose(&ctl) != 0)
|
|
|
29d451 |
nerrs++;
|
|
|
29d451 |
ct++;
|
|
|
29d451 |
@@ -482,6 +516,8 @@
|
|
|
29d451 |
|
|
|
29d451 |
proc_processes_filter_by_name(ps, ctl.arg);
|
|
|
29d451 |
while (proc_next_pid(ps, &ctl.pid) == 0) {
|
|
|
29d451 |
+ if (check_signal_handler(&ctl) <= 0)
|
|
|
29d451 |
+ continue;
|
|
|
29d451 |
if (kill_verbose(&ctl) != 0)
|
|
|
29d451 |
nerrs++;
|
|
|
29d451 |
ct++;
|