umount: Allow superblock owners to force umount

e1ff7aa3 · Trond Myklebust <[email protected]> · 2025-03-18 12:29:21 -04:00

Loosen the permission check on forced umount to allow users holding
CAP_SYS_ADMIN privileges in namespaces that are privileged with respect
to the userns that originally mounted the filesystem.

Signed-off-by: Trond Myklebust <[email protected]>
Link: https://lore.kernel.org/r/12f212d4ef983714d065a6bb372fbb378753bf4c.1742315194.git.trond.myklebust@hammerspace.com
Acked-by: "Eric W. Biederman" <[email protected]>
Signed-off-by: Christian Brauner <[email protected]>

Commit: e1ff7aa34dec7e650159fd7ca8ec6af7cc428d9f
Parents: e1c24b52

Changes

1 files changed · +2 −1

File	Status	Add	Del	Content
fs/namespace.c	modified	+2	−1	View file

fs/namespace.c

View file

diff --git a/fs/namespace.c b/fs/namespace.c
index 01fb107..57c14af 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -2105,6 +2105,7 @@ static void warn_mandlock(void)
 static int can_umount(const struct path *path, int flags)
 {
 	struct mount *mnt = real_mount(path->mnt);
+	struct super_block *sb = path->dentry->d_sb;
 
 	if (!may_mount())
 		return -EPERM;
@@ -2114,7 +2115,7 @@ static int can_umount(const struct path *path, int flags)
 		return -EINVAL;
 	if (mnt->mnt.mnt_flags & MNT_LOCKED) /* Check optimistically */
 		return -EINVAL;
-	if (flags & MNT_FORCE && !capable(CAP_SYS_ADMIN))
+	if (flags & MNT_FORCE && !ns_capable(sb->s_user_ns, CAP_SYS_ADMIN))
 		return -EPERM;
 	return 0;
 }