picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nspawn: better use setresuid() instead of setreuid()

This commit is contained in:
Lennart Poettering 2011-07-01 23:53:14 +02:00
parent 687d0825a4
commit 5c94603d4c
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@ -77,6 +77,8 @@ Features:
controllers together in order to guarantee atomic creation/addition
of cgroups
* don't enter "exited" mode for sysv services with pid file
* avoid DefaultStandardOutput=syslog to have any effect on StandardInput=socket services
* cgroup_notify_empty(): recursively check groups up the tree, too

8
src/nspawn.c
View File

@ -797,12 +797,12 @@ int main(int argc, char *argv[]) {
goto child_fail;
}
if (setregid(gid, gid) < 0) {
if (setresgid(gid, gid, gid) < 0) {
log_error("setregid() failed: %m");
goto child_fail;
}
if (setreuid(uid, uid) < 0) {
if (setresuid(uid, uid, uid) < 0) {
log_error("setreuid() failed: %m");
goto child_fail;
}
@ -811,7 +811,7 @@ int main(int argc, char *argv[]) {
if ((asprintf((char**)(envp + 2), "HOME=%s", home? home: "/root") < 0) ||
(asprintf((char**)(envp + 3), "USER=%s", arg_user? arg_user : "root") < 0) ||
(asprintf((char**)(envp + 4), "LOGNAME=%s", arg_user? arg_user : "root") < 0)) {
log_error("environment setup failed: %m");
log_error("Out of memory");
goto child_fail;
}
@ -821,7 +821,7 @@ int main(int argc, char *argv[]) {
if (argc > optind)
execvpe(argv[optind], argv + optind, (char**) envp);
else {
chdir(home? home : "/root");
chdir(home ? home : "/root");
execle("/bin/bash", "-bash", NULL, (char**) envp);
}