Skip to content

Commit

Permalink
Disable private mounts in chroot'ed operation in the unshare plugin
Browse files Browse the repository at this point in the history
mount(NULL, "/", NULL, MS_REC | MS_PRIVATE, NULL) inside a chroot
fails with EINVAL if the "/" inside the chroot is not an actual
mount point on the system - as it often isn't. For now, just disable
that functionality on chroot operation.

Related: #3187
  • Loading branch information
pmatilai authored and dmnks committed Sep 20, 2024
1 parent d05c4fc commit 931cb97
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 5 deletions.
5 changes: 5 additions & 0 deletions docs/man/rpm-plugin-unshare.8.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ This plugin implements the following configurables:
execution. Typical examples would be `/tmp` to protect against
insecure temporary file usage inside scriptlets, and `/home` to
prevent scriptlets from accessing user home directories.
When path unsharing is enabled, any mounts made from scriptlets
are also private to the scriptlet (and vice versa, mount changes
on the host are not visible to the scriptlet).

Private mounts in chroot-operations is unimplemented.

`%__transaction_unshare_nonet`

Expand Down
21 changes: 16 additions & 5 deletions plugins/unshare.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,18 @@ static rpmRC unshare_init(rpmPlugin plugin, rpmts ts)
{
char *paths = rpmExpand("%{?__transaction_unshare_paths}", NULL);
private_mounts = argvSplitString(paths, ":", ARGV_SKIPEMPTY);
if (private_mounts)
unshare_flags |= CLONE_NEWNS;
if (private_mounts) {
/*
* Changing mount propagation from inside a chroot fails if the root
* is not also a mount point, disable for now.
*/
if (strcmp(rpmtsRootDir(ts), "/")) {
rpmlog(RPMLOG_WARNING,
"private mounts in chroot not implemented\n");
} else {
unshare_flags |= CLONE_NEWNS;
}
}
free(paths);

if (rpmExpandNumeric("%{?__transaction_unshare_nonet}"))
Expand All @@ -47,9 +57,10 @@ static rpmRC unshare_scriptlet_fork_post(rpmPlugin plugin,
goto exit;
}

if (private_mounts) {
if (mount("/", "/", NULL, MS_REC | MS_PRIVATE, NULL) == -1) {
rpmlog(RPMLOG_ERR, _("failed to mount private %s: %s\n"),
if (unshare_flags & CLONE_NEWNS) {
if (mount(NULL, "/", NULL, MS_REC | MS_PRIVATE, NULL) == -1) {
rpmlog(RPMLOG_ERR,
_("failed to change mount propagation %s: %s\n"),
"/", strerror(errno));
goto exit;
}
Expand Down

0 comments on commit 931cb97

Please sign in to comment.