Only chdir to cwd if it is different from the current cwd or there

is a new root (chroot).
This commit is contained in:
Todd C. Miller
2010-11-08 16:40:11 -05:00
parent 8528827500
commit 01dcbfce70

View File

@@ -848,12 +848,17 @@ exec_setup(struct command_details *details, const char *ptyname, int ptyfd)
}
#endif /* !HAVE_SETRESUID && !HAVE_SETREUID */
/* Set cwd after uid to avoid permissions problems. */
/*
* Only change cwd if we have chroot()ed or the policy modules
* specifies a different cwd. Must be done after uid change.
*/
if (details->cwd) {
/* Note: cwd is relative to the new root, if any. */
if (chdir(details->cwd) != 0) {
warning("unable to change directory to %s", details->cwd);
goto done;
if (details->chroot || strcmp(details->cwd, user_details.cwd) != 0) {
/* Note: cwd is relative to the new root, if any. */
if (chdir(details->cwd) != 0) {
warning("unable to change directory to %s", details->cwd);
goto done;
}
}
}