Skip to content

Commit 69dbdc7

Browse files
cyphargregkh
authored andcommitted
open_tree_attr: do not allow id-mapping changes without OPEN_TREE_CLONE
commit 9308366 upstream. As described in commit 7a54947 ('Merge patch series "fs: allow changing idmappings"'), open_tree_attr(2) was necessary in order to allow for a detached mount to be created and have its idmappings changed without the risk of any racing threads operating on it. For this reason, mount_setattr(2) still does not allow for id-mappings to be changed. However, there was a bug in commit 2462651 ("fs: allow changing idmappings") which allowed users to bypass this restriction by calling open_tree_attr(2) *without* OPEN_TREE_CLONE. can_idmap_mount() prevented this bug from allowing an attached mountpoint's id-mapping from being modified (thanks to an is_anon_ns() check), but this still allows for detached (but visible) mounts to have their be id-mapping changed. This risks the same UAF and locking issues as described in the merge commit, and was likely unintentional. Fixes: 2462651 ("fs: allow changing idmappings") Cc: stable@vger.kernel.org # v6.15+ Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> Link: https://lore.kernel.org/20250808-open_tree_attr-bugfix-idmap-v1-1-0ec7bc05646c@cyphar.com Signed-off-by: Christian Brauner <brauner@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 23a94fc commit 69dbdc7

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

fs/namespace.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5302,7 +5302,8 @@ SYSCALL_DEFINE5(open_tree_attr, int, dfd, const char __user *, filename,
53025302
int ret;
53035303
struct mount_kattr kattr = {};
53045304

5305-
kattr.kflags = MOUNT_KATTR_IDMAP_REPLACE;
5305+
if (flags & OPEN_TREE_CLONE)
5306+
kattr.kflags = MOUNT_KATTR_IDMAP_REPLACE;
53065307
if (flags & AT_RECURSIVE)
53075308
kattr.kflags |= MOUNT_KATTR_RECURSE;
53085309

0 commit comments

Comments
 (0)