tequilaOS/platform_external_selinux
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

policycoreutils: handle argument counter of zero

Browse source 
The number of arguments passed to main(), argc, can be zero if the
pathname passed to execve(2) is NULL, e.g. via:

    execve("/path/to/exe", {NULL}, {NULL});

Also avoid NULL pointer dereferences on the argument value.

Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
This commit is contained in:
Christian Göttsche 2022-01-26 15:56:45 +01:00 committed by James Carter
parent 7385004162
commit 9229f8b3b7
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
policycoreutils/run_init/open_init_pty.c
View file

@ -244,7 +244,7 @@ int main(int argc, char *argv[])
rb_init(&inbuf, inbuf_mem, sizeof(inbuf_mem));
rb_init(&outbuf, outbuf_mem, sizeof(outbuf_mem));
if (argc == 1) {
if (argc < 2) {
printf("usage: %s PROGRAM [ARGS]...\n", argv[0]);
exit(1);
}

3
policycoreutils/secon/secon.c
View file

@ -333,6 +333,9 @@ static void cmd_line(int argc, char *argv[])
opts->from_type = OPTS_FROM_CUR;
if (opts->from_type == OPTS_FROM_ARG) {
if (!argv[0])
errx(EXIT_FAILURE, "No argument given");
opts->f.arg = argv[0];
if (xstreq(argv[0], "-"))

6
policycoreutils/setfiles/setfiles.c
View file

@ -163,6 +163,10 @@ int main(int argc, char **argv)
policyfile = NULL;
r_opts.abort_on_error = 0;
if (!argv[0]) {
fprintf(stderr, "Called without required program name!\n");
exit(-1);
}
r_opts.progname = strdup(argv[0]);
if (!r_opts.progname) {
fprintf(stderr, "%s: Out of memory!\n", argv[0]);
@ -423,7 +427,7 @@ int main(int argc, char **argv)
altpath = argv[optind];
optind++;
} else if (argc == 1)
} else if (argc < 2)
usage(argv[0]);
/* Set selabel_open options. */