emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/external/fexec.c: error out if chroot/chdir fails, ignore target_arch.

Browse Source
This commit is contained in:
Juan RP 2013-03-07 18:07:47 +01:00
parent bcae7e83aa
commit fd7153fe5c
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/external/fexec.c vendored
View File

@ -42,7 +42,6 @@ static int
pfcexec(struct xbps_handle *xhp, const char *file, const char **argv) pfcexec(struct xbps_handle *xhp, const char *file, const char **argv)
{ {
pid_t child; pid_t child;
const char *tarch;
int status; int status;
child = vfork(); child = vfork();
@ -52,12 +51,17 @@ pfcexec(struct xbps_handle *xhp, const char *file, const char **argv)
* If rootdir != / and uid==0 and bin/sh exists, * If rootdir != / and uid==0 and bin/sh exists,
* change root directory and exec command. * change root directory and exec command.
*/ */
tarch = getenv("XBPS_TARGET_ARCH");
if (strcmp(xhp->rootdir, "/")) { if (strcmp(xhp->rootdir, "/")) {
if (!tarch && geteuid() == 0 && access("bin/sh", X_OK) == 0) { if (geteuid() == 0 && access("bin/sh", X_OK) == 0) {
if (chroot(xhp->rootdir) == 0) { if (chroot(xhp->rootdir) == -1) {
if (chdir("/") == -1) xbps_dbg_printf(xhp, "%s: chroot() "
_exit(129); "failed: %s\n", *argv, strerror(errno));
_exit(errno);
}
if (chdir("/") == -1) {
xbps_dbg_printf(xhp, "%s: chdir() "
"failed: %s\n", *argv, strerror(errno));
_exit(errno);
} }
} }
} }