diff options
author | Steve Langasek <vorlon@debian.org> | 2014-01-14 19:48:51 -0800 |
---|---|---|
committer | Steve Langasek <vorlon@debian.org> | 2014-01-15 09:53:26 -0800 |
commit | fbc65c39d6853af268c9a093923afc876d0b138e (patch) | |
tree | 3243b091a0432f4d503558ca6ddf2e4d7c4908f3 /modules/pam_namespace/pam_namespace.c | |
parent | 24f3a88e7de52fbfcb7b8a1ebdae0cdbef420edf (diff) | |
download | pam-fbc65c39d6853af268c9a093923afc876d0b138e.tar.gz pam-fbc65c39d6853af268c9a093923afc876d0b138e.tar.bz2 pam-fbc65c39d6853af268c9a093923afc876d0b138e.zip |
pam_namespace: don't use bashisms in default namespace.init script
* modules/pam_namespace/pam_namespace.c: call setuid() before execing the
namespace init script, so that scripts run with maximum privilege regardless
of the shell implementation.
* modules/pam_namespace/namespace.init: drop the '-p' bashism from the
shebang line
This is not a POSIX standard option, it's a bashism. The bash manpage says
that it's used to prevent the effective user id from being reset to the real
user id on startup, and to ignore certain unsafe variables from the
environment.
In the case of pam_namespace, the -p is not necessary for environment
sanitizing because the PAM module (properly) sanitizes the environment
before execing the script.
The stated reason given in CVS history for passing -p is to "preserve euid
when called from setuid apps (su, newrole)." This should be done more
portably, by calling setuid() before spawning the shell.
Signed-off-by: Steve Langasek <vorlon@debian.org>
Bug-Debian: http://bugs.debian.org/624842
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1081323
Diffstat (limited to 'modules/pam_namespace/pam_namespace.c')
-rw-r--r-- | modules/pam_namespace/pam_namespace.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/modules/pam_namespace/pam_namespace.c b/modules/pam_namespace/pam_namespace.c index e0d5e30b..92883f56 100644 --- a/modules/pam_namespace/pam_namespace.c +++ b/modules/pam_namespace/pam_namespace.c @@ -1205,6 +1205,11 @@ static int inst_init(const struct polydir_s *polyptr, const char *ipath, _exit(1); } #endif + /* Pass maximum privs when we exec() */ + if (setuid(geteuid()) < 0) { + /* ignore failures, they don't matter */ + } + if (execle(init_script, init_script, polyptr->dir, ipath, newdir?"1":"0", idata->user, NULL, envp) < 0) _exit(1); |