[RFC PATCH v5 05/25] mount: Enforce mount_too_revealing() for foreign mntns
From: Jarkko Sakkinen
Date: Fri Nov 20 2026 - 19:09:46 EST
mount_too_revealing() skips visibility checks whenever
current->nsproxy->mnt_ns belongs to init_user_ns, assuming the caller
holds CAP_SYS_ADMIN in its current mount namespace. That assumption does
not hold when an unprivileged caller creates mounts for a child user
namespace while running in init_mnt_ns or another foreign mount
namespace.
Require CAP_SYS_ADMIN in init_user_ns before bypassing
mount_too_revealing() for init_mnt_ns, reject chrooted callers lacking
CAP_SYS_ADMIN in their current mount namespace, and treat existing
mounts and child overmounts in a foreign mount namespace as locked
during mnt_already_visible() checks.
Co-developed-by: David Howells <dhowells@xxxxxxxxxx>
Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
Signed-off-by: Jarkko Sakkinen <jarkko@xxxxxxxxxx>
---
fs/namespace.c | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/fs/namespace.c b/fs/namespace.c
index 781380945d78..b2dc84c0d0d6 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -6582,6 +6582,7 @@ static bool mnt_already_visible(struct mnt_namespace *ns,
const struct super_block *sb,
int *new_mnt_flags)
{
+ bool foreign_ns = !ns_capable_noaudit(ns->user_ns, CAP_SYS_ADMIN);
int new_flags = *new_mnt_flags;
struct mount *mnt;
@@ -6606,11 +6607,16 @@ static bool mnt_already_visible(struct mnt_namespace *ns,
continue;
/* A local view of the mount flags */
- mnt_flags = mnt->mnt.mnt_flags;
+ mnt_flags = READ_ONCE(mnt->mnt.mnt_flags);
/* Don't miss readonly hidden in the superblock flags */
if (sb_rdonly(mnt->mnt.mnt_sb))
mnt_flags |= MNT_LOCK_READONLY;
+ if (foreign_ns) {
+ if (mnt_flags & MNT_READONLY)
+ mnt_flags |= MNT_LOCK_READONLY;
+ mnt_flags |= MNT_LOCK_ATIME;
+ }
/* Verify the mount flags are equal to or more permissive
* than the proposed new mount.
@@ -6629,7 +6635,7 @@ static bool mnt_already_visible(struct mnt_namespace *ns,
list_for_each_entry(child, &mnt->mnt_mounts, mnt_child) {
struct inode *inode = child->mnt_mountpoint->d_inode;
/* Only worry about locked mounts */
- if (!(child->mnt.mnt_flags & MNT_LOCKED))
+ if (!foreign_ns && !(READ_ONCE(child->mnt.mnt_flags) & MNT_LOCKED))
continue;
/* Is the directory permanently empty? */
if (!is_empty_dir_inode(inode))
@@ -6650,13 +6656,18 @@ static bool mount_too_revealing(const struct super_block *sb, int *new_mnt_flags
struct mnt_namespace *ns = current->nsproxy->mnt_ns;
unsigned long s_iflags;
- if (ns->user_ns == &init_user_ns)
- return false;
-
/* Can this filesystem be too revealing? */
if (!(sb->s_type->fs_flags & FS_USERNS_MOUNT_RESTRICTED))
return false;
+ if (ns->user_ns == &init_user_ns &&
+ ns_capable_noaudit(&init_user_ns, CAP_SYS_ADMIN))
+ return false;
+
+ if (!ns_capable_noaudit(ns->user_ns, CAP_SYS_ADMIN) &&
+ current_chrooted())
+ return true;
+
s_iflags = sb->s_iflags;
if ((s_iflags & required_iflags) != required_iflags) {
WARN_ONCE(1, "Expected s_iflags to contain 0x%lx\n",
--
2.47.3