diff options
| author | Alejandro Colomar <alx@kernel.org> | 2024-03-07 23:38:48 +0100 |
|---|---|---|
| committer | Serge Hallyn <serge@hallyn.com> | 2024-03-08 10:24:15 -0600 |
| commit | 89c4da43cbe8cfbbd949f523944343391c5302a2 (patch) | |
| tree | c0f2958f89f463ab6a98675755d9b52c5bbf882d | |
| parent | 0ab893a734b140a8e7ea65b20ec65b08bb95d4fe (diff) | |
src/vipw.c: Use string literals to initialize 'Prog'
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>
| -rw-r--r-- | src/vipw.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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); { /* |