jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

database: do not chroot(".") unless actually necessary 

If we use default root (/), then we do not have to chroot to run scripts.
Use APK_NO_CHROOT flag for this scenario to avoid the chroot.  This helps
with using apk with bwrap and OSTree.

Closes #10736.
cute-signatures
Ariadne Conill 2021-03-18 23:15:01 -06:00 committed by Timo Teräs
parent 511621438d
commit 4fe5ac8328
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/apk_context.h
View File

@ -25,6 +25,7 @@
#define APK_NO_SCRIPTS BIT(8)
#define APK_NO_CACHE BIT(9)
#define APK_NO_COMMIT_HOOKS BIT(10)
#define APK_NO_CHROOT BIT(11)
#define APK_FORCE_OVERWRITE BIT(0)
#define APK_FORCE_OLD_APK BIT(1)

1
src/context.c
View File

@ -42,6 +42,7 @@ int apk_ctx_prepare(struct apk_ctx *ac)
if (!ac->keys_dir) ac->keys_dir = "etc/apk/keys";
if (!ac->root) ac->root = "/";
if (!ac->cache_max_age) ac->cache_max_age = 4*60*60; /* 4 hours default */
if (!strcmp(ac->root, "/")) ac->flags |= APK_NO_CHROOT; /* skip chroot if root is default */
ac->root_fd = openat(AT_FDCWD, ac->root, O_RDONLY | O_CLOEXEC);
if (ac->root_fd < 0 && (ac->open_flags & APK_OPENF_CREATE)) {

12
src/database.c
View File

@ -1906,7 +1906,17 @@ int apk_db_run_script(struct apk_database *db, char *fn, char **argv)
}
if (pid == 0) {
umask(0022);
if (fchdir(db->root_fd) == 0 && chroot(".") == 0)
if (fchdir(db->root_fd) != 0) {
apk_err(out, "%s: fchdir: %s", basename(fn), strerror(errno));
exit(127);
}
if (!(db->ctx->flags & APK_NO_CHROOT) && chroot(".") != 0) {
apk_err(out, "%s: chroot: %s", basename(fn), strerror(errno));
exit(127);
}
execve(fn, argv, environment);
exit(127); /* should not get here */
}