emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

skill: fix command line with signal, again

Browse Source 
Have skill_sig_option sanitize the command line by properly decrementing
*argc after moving the arguments to remove the -signal one.

One bug caused by this issue was when running `kill -1`, then the code
would interpret -1 as both SIGHUP and as process group -1 and send
SIGHUP to all of them. Or `kill -28` which would send SIGWINCH to
process group -2 (in another bug, the -pgid support only accepts a
single digit, fix for that bug will follow.)

This also reverts commit 7610b3128e ("skill: fix command line with
signal") which worked around this bug in `skill` and also removes the
"sigopt" hack which worked around this bug in `kill`.

The skill_sig_option implementation is compatible with signal_option()
from pgrep.c. I plan to factor them out into a single source file in a
follow up commit, to prevent the duplication.

This commit fixes the issues reported above. I also tested the issues
from commit 7610b3128e, `skill -9 -t pts/0` works as expected, also
tried `kill` with -signal and a number of pids and it worked as
expected.

Also tested that `make check` and `make distcheck` keep working.

Signed-off-by: Filipe Brandenburger <filbranden@google.com>
This commit is contained in:
Filipe Brandenburger 2015-06-04 22:07:49 -07:00
parent 2617d03a33
commit d1d2ccf732
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
skill.c
View File

@ -398,17 +398,15 @@ static void __attribute__ ((__noreturn__)) skillsnice_usage(FILE * out)
static int skill_sig_option(int *argc, char **argv) static int skill_sig_option(int *argc, char **argv)
{ {
int i, nargs = *argc; int i;
int signo = -1; int signo = -1;
for (i = 1; i < nargs; i++) { for (i = 1; i < *argc; i++) {
if (argv[i][0] == '-') { if (argv[i][0] == '-') {
signo = signal_name_to_number(argv[i] + 1); signo = signal_name_to_number(argv[i] + 1);
if (-1 < signo) { if (-1 < signo) {
if (nargs - i) { memmove(argv + i, argv + i + 1,
nargs--; sizeof(char *) * (*argc - i));
memmove(argv + i, argv + i + 1, (*argc)--;
sizeof(char *) * (nargs - i));
}
return signo; return signo;
} }
} }
@ -421,7 +419,6 @@ static void __attribute__ ((__noreturn__))
kill_main(int argc, char **argv) kill_main(int argc, char **argv)
{ {
int signo, i; int signo, i;
int sigopt = 0;
int loop = 1; int loop = 1;
long pid; long pid;
int exitvalue = EXIT_SUCCESS; int exitvalue = EXIT_SUCCESS;
@ -446,8 +443,6 @@ static void __attribute__ ((__noreturn__))
signo = skill_sig_option(&argc, argv); signo = skill_sig_option(&argc, argv);
if (signo < 0) if (signo < 0)
signo = SIGTERM; signo = SIGTERM;
else
sigopt++;
opterr=0; /* suppress errors on -123 */ opterr=0; /* suppress errors on -123 */
while (loop == 1 && (i = getopt_long(argc, argv, "l::Ls:hV", longopts, NULL)) != -1) while (loop == 1 && (i = getopt_long(argc, argv, "l::Ls:hV", longopts, NULL)) != -1)
@ -495,7 +490,7 @@ static void __attribute__ ((__noreturn__))
kill_usage(stderr); kill_usage(stderr);
} }
argc -= optind + sigopt; argc -= optind;
argv += optind; argv += optind;
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
@ -588,10 +583,8 @@ static void skillsnice_parse(int argc,
prino = snice_prio_option(&argc, argv); prino = snice_prio_option(&argc, argv);
else if (program == PROG_SKILL) { else if (program == PROG_SKILL) {
signo = skill_sig_option(&argc, argv); signo = skill_sig_option(&argc, argv);
if (-1 < signo) { if (-1 < signo)
sig_or_pri = signo; sig_or_pri = signo;
argc -= 1;
}
} }
pid_count = 0; pid_count = 0;