keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

compose: Fix EBADF in unified core mode without cachedir

Browse Source 
If no cache dir is given in the workdir, we would alias the cache dir fd
to the workdir fd. But of course, this meant that we'd try to close the
same fd twice when freeing the compose context. Instead, let's just copy
the fd as is also done in the non-unified path.

Closes: #1697

Closes: #1698
Approved by: lucab
This commit is contained in:
Jonathan Lebon 2018-12-05 16:51:40 -05:00 committed by Atomic Bot
parent bdf3cda8db
commit 544d79fd3f
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/rpmostree-compose-builtin-tree.c
View File

@ -586,7 +586,9 @@ rpm_ostree_compose_context_new (const char *treefile_pathstr,
return FALSE; return FALSE;
} }
self->cachedir_dfd = self->workdir_tmp.fd; self->cachedir_dfd = fcntl (self->workdir_tmp.fd, F_DUPFD_CLOEXEC, 3);
if (self->cachedir_dfd < 0)
return glnx_throw_errno_prefix (error, "fcntl");
} }
self->pkgcache_repo = ostree_repo_create_at (self->cachedir_dfd, "pkgcache-repo", self->pkgcache_repo = ostree_repo_create_at (self->cachedir_dfd, "pkgcache-repo",
@ -604,7 +606,7 @@ rpm_ostree_compose_context_new (const char *treefile_pathstr,
if (!self->build_repo) if (!self->build_repo)
return glnx_prefix_error (error, "Creating repo-build"); return glnx_prefix_error (error, "Creating repo-build");
/* Note special handling of this aliasing in _finalize() */ /* Note special handling of this aliasing in rpm_ostree_tree_compose_context_free() */
self->workdir_dfd = self->workdir_tmp.fd; self->workdir_dfd = self->workdir_tmp.fd;
} }
else else
@ -613,7 +615,7 @@ rpm_ostree_compose_context_new (const char *treefile_pathstr,
{ {
if (!glnx_mkdtempat (AT_FDCWD, "/var/tmp/rpm-ostree.XXXXXX", 0700, &self->workdir_tmp, error)) if (!glnx_mkdtempat (AT_FDCWD, "/var/tmp/rpm-ostree.XXXXXX", 0700, &self->workdir_tmp, error))
return FALSE; return FALSE;
/* Note special handling of this aliasing in _finalize() */ /* Note special handling of this aliasing in rpm_ostree_tree_compose_context_free() */
self->workdir_dfd = self->workdir_tmp.fd; self->workdir_dfd = self->workdir_tmp.fd;
} }
else else

5
tests/compose-tests/test-basic-unified.sh
View File

@ -26,6 +26,11 @@ cat > metadata.json <<EOF
EOF EOF
runcompose --ex-unified-core --add-metadata-from-json metadata.json runcompose --ex-unified-core --add-metadata-from-json metadata.json
# Run it again, but without RPMOSTREE_PRESERVE_TMPDIR. Should be a no-op. This
# exercises fd handling in the tree context.
rpm-ostree compose tree ${compose_base_argv} ${treefile} "$@"
echo "ok no cachedir"
. ${dn}/libbasic-test.sh . ${dn}/libbasic-test.sh
basic_test basic_test