]> git.ipfire.org Git - thirdparty/shadow.git/commitdiff
src/vipw.c: Use string literals to initialize 'Prog'
authorAlejandro Colomar <alx@kernel.org>
Thu, 7 Mar 2024 22:38:48 +0000 (23:38 +0100)
committerSerge Hallyn <serge@hallyn.com>
Fri, 8 Mar 2024 16:24:15 +0000 (10:24 -0600)
This avoids using argv[0], which is controlled by the user,
and might inject arbitrary text in stderr and the logs.

Link: <https://github.com/shadow-maint/shadow/issues/959>
Link: <https://github.com/shadow-maint/shadow/pull/960>
Cc: "Skyler Ferrante (RIT Student)" <sjf5462@rit.edu>
Cc: "Serge E. Hallyn" <serge@hallyn.com>
Cc: Karel Zak <kzak@redhat.com>
Cc: Iker Pedrosa <ipedrosa@redhat.com>
Cc: Christian Brauner <christian@brauner.io>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
src/vipw.c

index 609ac1bfcb05ce6365d10875858084a0bb4e883b..c30b32dee3b34e3ab21fa384905e4ebd6b7d1ca1 100644 (file)
@@ -55,7 +55,7 @@
 /*
  * Global variables
  */
-const char *Prog;
+static const char *Prog;
 
 static const char *filename, *fileeditname;
 static bool filelocked = false;
@@ -471,7 +471,9 @@ int main (int argc, char **argv)
        bool  editshadow = false;
        bool  do_vigr;
 
-       Prog = Basename (argv[0]);
+       do_vigr = (strcmp(Basename(argv[0]), "vigr") == 0);
+
+       Prog = do_vigr ? "vigr" : "vipw";
        log_set_progname(Prog);
        log_set_logfd(stderr);
 
@@ -481,9 +483,7 @@ int main (int argc, char **argv)
 
        process_root_flag ("-R", argc, argv);
 
-       do_vigr = (strcmp(Prog, "vigr") == 0);
-
-       OPENLOG(do_vigr ? "vigr" : "vipw");
+       OPENLOG(Prog);
 
        {
                /*