* [PATCH] policycoreutils: handle argument counter of zero
@ 2022-01-26 14:56 Christian Göttsche
2022-01-26 22:12 ` James Carter
0 siblings, 1 reply; 3+ messages in thread
From: Christian Göttsche @ 2022-01-26 14:56 UTC (permalink / raw)
To: selinux
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>
---
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(-)
diff --git a/policycoreutils/run_init/open_init_pty.c b/policycoreutils/run_init/open_init_pty.c
index 150cb45e..19101c50 100644
--- a/policycoreutils/run_init/open_init_pty.c
+++ b/policycoreutils/run_init/open_init_pty.c
@@ -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);
}
diff --git a/policycoreutils/secon/secon.c b/policycoreutils/secon/secon.c
index a0957d09..d624fa13 100644
--- a/policycoreutils/secon/secon.c
+++ b/policycoreutils/secon/secon.c
@@ -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], "-"))
diff --git a/policycoreutils/setfiles/setfiles.c b/policycoreutils/setfiles/setfiles.c
index 44cab46d..ab7016ac 100644
--- a/policycoreutils/setfiles/setfiles.c
+++ b/policycoreutils/setfiles/setfiles.c
@@ -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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] policycoreutils: handle argument counter of zero
2022-01-26 14:56 [PATCH] policycoreutils: handle argument counter of zero Christian Göttsche
@ 2022-01-26 22:12 ` James Carter
2022-02-07 17:29 ` James Carter
0 siblings, 1 reply; 3+ messages in thread
From: James Carter @ 2022-01-26 22:12 UTC (permalink / raw)
To: Christian Göttsche; +Cc: SElinux list
On Wed, Jan 26, 2022 at 4:39 PM Christian Göttsche
<cgzones@googlemail.com> wrote:
>
> 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>
Acked-by: James Carter <jwcart2@gmail.com>
> ---
> 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(-)
>
> diff --git a/policycoreutils/run_init/open_init_pty.c b/policycoreutils/run_init/open_init_pty.c
> index 150cb45e..19101c50 100644
> --- a/policycoreutils/run_init/open_init_pty.c
> +++ b/policycoreutils/run_init/open_init_pty.c
> @@ -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);
> }
> diff --git a/policycoreutils/secon/secon.c b/policycoreutils/secon/secon.c
> index a0957d09..d624fa13 100644
> --- a/policycoreutils/secon/secon.c
> +++ b/policycoreutils/secon/secon.c
> @@ -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], "-"))
> diff --git a/policycoreutils/setfiles/setfiles.c b/policycoreutils/setfiles/setfiles.c
> index 44cab46d..ab7016ac 100644
> --- a/policycoreutils/setfiles/setfiles.c
> +++ b/policycoreutils/setfiles/setfiles.c
> @@ -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
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] policycoreutils: handle argument counter of zero
2022-01-26 22:12 ` James Carter
@ 2022-02-07 17:29 ` James Carter
0 siblings, 0 replies; 3+ messages in thread
From: James Carter @ 2022-02-07 17:29 UTC (permalink / raw)
To: Christian Göttsche; +Cc: SElinux list
On Wed, Jan 26, 2022 at 5:12 PM James Carter <jwcart2@gmail.com> wrote:
>
> On Wed, Jan 26, 2022 at 4:39 PM Christian Göttsche
> <cgzones@googlemail.com> wrote:
> >
> > 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>
>
> Acked-by: James Carter <jwcart2@gmail.com>
>
Merged.
Thanks,
Jim
> > ---
> > 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(-)
> >
> > diff --git a/policycoreutils/run_init/open_init_pty.c b/policycoreutils/run_init/open_init_pty.c
> > index 150cb45e..19101c50 100644
> > --- a/policycoreutils/run_init/open_init_pty.c
> > +++ b/policycoreutils/run_init/open_init_pty.c
> > @@ -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);
> > }
> > diff --git a/policycoreutils/secon/secon.c b/policycoreutils/secon/secon.c
> > index a0957d09..d624fa13 100644
> > --- a/policycoreutils/secon/secon.c
> > +++ b/policycoreutils/secon/secon.c
> > @@ -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], "-"))
> > diff --git a/policycoreutils/setfiles/setfiles.c b/policycoreutils/setfiles/setfiles.c
> > index 44cab46d..ab7016ac 100644
> > --- a/policycoreutils/setfiles/setfiles.c
> > +++ b/policycoreutils/setfiles/setfiles.c
> > @@ -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
> >
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-02-07 17:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-26 14:56 [PATCH] policycoreutils: handle argument counter of zero Christian Göttsche
2022-01-26 22:12 ` James Carter
2022-02-07 17:29 ` James Carter
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.