isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass envp, not environ, to real execve() from exec_wrapper() if possible.

Browse Source 
The replacement execve() function was passing the global environ
to exec_wrapper() instead of the envp parameter.  This caused the
command to be run with the wrong environment on AIX systems, and
possibly others, when intercept or log_subcmds was enabled.
Bug #1030.
This commit is contained in:
Todd C. Miller
2022-05-26 16:33:46 -06:00
parent b6ddf3db6d
commit dc2b28d3e0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sudo_intercept.c
View File

@@ -1,7 +1,7 @@
/* /*
* SPDX-License-Identifier: ISC * SPDX-License-Identifier: ISC
* *
* Copyright (c) 2021 Todd C. Miller <Todd.Miller@sudo.ws> * Copyright (c) 2021-2022 Todd C. Miller <Todd.Miller@sudo.ws>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@@ -232,7 +232,7 @@ typedef struct interpose_s {
static int static int
my_execve(const char *cmnd, char * const argv[], char * const envp[]) my_execve(const char *cmnd, char * const argv[], char * const envp[])
{ {
return exec_wrapper(cmnd, argv, environ, false); return exec_wrapper(cmnd, argv, envp, false);
} }
static int static int
@@ -335,7 +335,7 @@ sudo_shl_get_next(const char *symbol, short type)
sudo_dso_public int sudo_dso_public int
execve(const char *cmnd, char * const argv[], char * const envp[]) execve(const char *cmnd, char * const argv[], char * const envp[])
{ {
return exec_wrapper(cmnd, argv, environ, false); return exec_wrapper(cmnd, argv, envp, false);
} }
sudo_dso_public int sudo_dso_public int