policycoreutils: handle argument counter of zero
PATCH 1/1 policycoreutils: handle argument counter of zero
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 <[email protected]>
--- policycoreutils/run_init/open_init_pty.c | 2 +- policycoreutils/secon/secon.c | 3 +++ policycoreutils/setfiles/setfiles.c | 6 +++++- 3 files changed, 9 insertions(+), 2 deletions(-)
policycoreutils/run_init/open_init_pty.c +1 -1
@@ -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 ); }
policycoreutils/secon/secon.c +3 -0
@@ -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 ],"-" ))
policycoreutils/setfiles/setfiles.c +5 -1
@@ -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. */
Signature · 1 line
2.34.1
Quoted 9 lines · Christian Göttsche
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 <[email protected]>
Acked-by James Carter <[email protected]>
Quoted 60 lines
--- policycoreutils/run_init/open_init_pty.c | 2 +- policycoreutils/secon/secon.c | 3 +++ policycoreutils/setfiles/setfiles.c | 6 +++++- 3 files changed, 9 insertions(+), 2 deletions(-)policycoreutils/run_init/open_init_pty.c +1
-1@@ -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 ); }policycoreutils/secon/secon.c +3
-0@@ -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 ],"-" ))policycoreutils/setfiles/setfiles.c +5
-2@@ -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. */ --2.34.1
Quoted 7 lines · James Carter
Quoted 4 lines · Christian Göttsche
The number of arguments passed to
main(), argc, can be zero if the pathname passed to execve(2) is NULL, e.g. via:
Quoted 8 lines
Quoted 5 lines
execve("/path/to/exe", {NULL}, {NULL});Also avoid NULL pointer dereferences on the argument value.
Signed-off-by Christian Göttsche <[email protected]>Acked-by James Carter <[email protected]>
Merged.
Thanks,
Jim
Quoted 60 lines
Quoted 60 lines
--- policycoreutils/run_init/open_init_pty.c | 2 +- policycoreutils/secon/secon.c | 3 +++ policycoreutils/setfiles/setfiles.c | 6 +++++- 3 files changed, 9 insertions(+), 2 deletions(-)policycoreutils/run_init/open_init_pty.c +1
-1@@ -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 ); }policycoreutils/secon/secon.c +3
-0@@ -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 ],"-" ))policycoreutils/setfiles/setfiles.c +5
-2@@ -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. */ --2.34.1