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>
This commit is contained in:
committed by
Serge Hallyn
parent
0ab893a734
commit
89c4da43cb
10
src/vipw.c
10
src/vipw.c
@@ -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);
|
||||
|
||||
{
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user