mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-31 22:35:10 +00:00
Code Issues Releases Wiki Activity

Repair SELinux support, broken by 397722cdd7ec.

Browse Source 
From Daniel Kopecek.
This commit is contained in:
Todd C. Miller
2016-05-11 14:02:43 -06:00
parent 05db5aa3b8
commit d3622b0f2c
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/selinux.c
View File

@@ -379,7 +379,7 @@ selinux_execve(int fd, const char *path, char *const argv[], char *envp[],
{ {
char **nargv; char **nargv;
const char *sesh; const char *sesh;
int argc, serrno; int argc, nargc, serrno;
debug_decl(selinux_execve, SUDO_DEBUG_SELINUX) debug_decl(selinux_execve, SUDO_DEBUG_SELINUX)
sesh = sudo_conf_sesh_path(); sesh = sudo_conf_sesh_path();
@@ -410,9 +410,7 @@ selinux_execve(int fd, const char *path, char *const argv[], char *envp[],
*/ */
for (argc = 0; argv[argc] != NULL; argc++) for (argc = 0; argv[argc] != NULL; argc++)
continue; continue;
if (fd != -1) nargv = reallocarray(NULL, argc + 3, sizeof(char *));
argc++;
nargv = reallocarray(NULL, argc + 2, sizeof(char *));
if (nargv == NULL) { if (nargv == NULL) {
sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory")); sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory"));
debug_return; debug_return;
@@ -421,13 +419,13 @@ selinux_execve(int fd, const char *path, char *const argv[], char *envp[],
nargv[0] = *argv[0] == '-' ? "-sesh-noexec" : "sesh-noexec"; nargv[0] = *argv[0] == '-' ? "-sesh-noexec" : "sesh-noexec";
else else
nargv[0] = *argv[0] == '-' ? "-sesh" : "sesh"; nargv[0] = *argv[0] == '-' ? "-sesh" : "sesh";
argc = 1; nargc = 1;
if (fd != -1 && asprintf(&nargv[argc++], "--execfd=%d", fd) == -1) { if (fd != -1 && asprintf(&nargv[nargc++], "--execfd=%d", fd) == -1) {
sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory")); sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory"));
debug_return; debug_return;
} }
nargv[argc] = (char *)path; nargv[nargc++] = (char *)path;
memcpy(&nargv[argc + 1], &argv[argc], argc * sizeof(char *)); /* copies NULL */ memcpy(&nargv[nargc], &argv[argc], argc * sizeof(char *)); /* copies NULL */
/* sesh will handle noexec for us. */ /* sesh will handle noexec for us. */
sudo_execve(-1, sesh, nargv, envp, false); sudo_execve(-1, sesh, nargv, envp, false);