diff options
| author | Steve Langasek <steve.langasek@ubuntu.com> | 2019-01-03 21:06:54 -0800 |
|---|---|---|
| committer | Steve Langasek <vorlon@debian.org> | 2019-01-08 21:51:58 -0800 |
| commit | 3a4dfe474b63e2133aa190862149646eca2e3bda (patch) | |
| tree | add0a0f60e1fecb5b7383fc3edbbc16a91a48a7b /modules/pam_namespace/pam_namespace.c | |
| parent | 25743de9cb930e134fa533a21ec29fd28c75f26c (diff) | |
| parent | f3c0273b7bd2d7fdcac3fe3604cedd82afc57f49 (diff) | |
| download | pam-3a4dfe474b63e2133aa190862149646eca2e3bda.tar.gz pam-3a4dfe474b63e2133aa190862149646eca2e3bda.tar.bz2 pam-3a4dfe474b63e2133aa190862149646eca2e3bda.zip | |
merge upstream version 1.1.3
Diffstat (limited to 'modules/pam_namespace/pam_namespace.c')
| -rw-r--r-- | modules/pam_namespace/pam_namespace.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/modules/pam_namespace/pam_namespace.c b/modules/pam_namespace/pam_namespace.c index f6219271..a13f9599 100644 --- a/modules/pam_namespace/pam_namespace.c +++ b/modules/pam_namespace/pam_namespace.c @@ -1181,14 +1181,15 @@ static int inst_init(const struct polydir_s *polyptr, const char *ipath, } else { pid = fork(); if (pid == 0) { + static char *envp[] = { NULL }; #ifdef WITH_SELINUX if (idata->flags & PAMNS_SELINUX_ENABLED) { if (setexeccon(NULL) < 0) _exit(1); } #endif - if (execl(init_script, init_script, - polyptr->dir, ipath, newdir?"1":"0", idata->user, (char *)NULL) < 0) + if (execle(init_script, init_script, + polyptr->dir, ipath, newdir?"1":"0", idata->user, NULL, envp) < 0) _exit(1); } else if (pid > 0) { while (((rc = waitpid(pid, &status, 0)) == (pid_t)-1) && @@ -1608,13 +1609,14 @@ static int cleanup_tmpdirs(struct instance_data *idata) if (pptr->method == TMPDIR && access(pptr->instance_prefix, F_OK) == 0) { pid = fork(); if (pid == 0) { + static char *envp[] = { NULL }; #ifdef WITH_SELINUX if (idata->flags & PAMNS_SELINUX_ENABLED) { if (setexeccon(NULL) < 0) _exit(1); } #endif - if (execl("/bin/rm", "/bin/rm", "-rf", pptr->instance_prefix, (char *)NULL) < 0) + if (execle("/bin/rm", "/bin/rm", "-rf", pptr->instance_prefix, NULL, envp) < 0) _exit(1); } else if (pid > 0) { while (((rc = waitpid(pid, &status, 0)) == (pid_t)-1) && |