Skip to content

Commit 3f88b70

Browse files
committed
fs/fhandle.c: fix a race in call of has_locked_children()
JIRA: https://issues.redhat.com/browse/RHEL-107520 CVE: CVE-2025-38306 Conflicts: 1) A context diff with the has_locked_children() hunk and a merge conflict with clone_private_mount() hunk due to missing upstream commit db04662 ("fs: allow detached mounts in clone_private_mount()"). 2) A merge conflict with the __do_loopback() hunk due to missing upstream commit 9ed72af ("fs: add may_copy_tree()"). 3) The do_set_group() hunk is dropped due to missing upstream commit 9ffb14e ("move_mount: allow to add a mount into an existing group") which introduced the do_set_group() function. commit 1f282cd Author: Al Viro <viro@zeniv.linux.org.uk> Date: Sun, 1 Jun 2025 14:23:52 -0400 fs/fhandle.c: fix a race in call of has_locked_children() may_decode_fh() is calling has_locked_children() while holding no locks. That's an oopsable race... The rest of the callers are safe since they are holding namespace_sem and are guaranteed a positive refcount on the mount in question. Rename the current has_locked_children() to __has_locked_children(), make it static and switch the fs/namespace.c users to it. Make has_locked_children() a wrapper for __has_locked_children(), calling the latter under read_seqlock_excl(&mount_lock). Reviewed-by: Christian Brauner <brauner@kernel.org> Reviewed-by: Jeff Layton <jlayton@kernel.org> Fixes: 620c266 ("fhandle: relax open_by_handle_at() permission checks") Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Waiman Long <longman@redhat.com>
1 parent 06b8760 commit 3f88b70

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

fs/namespace.c

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1949,7 +1949,7 @@ void drop_collected_mounts(struct vfsmount *mnt)
19491949
namespace_unlock();
19501950
}
19511951

1952-
bool has_locked_children(struct mount *mnt, struct dentry *dentry)
1952+
static bool __has_locked_children(struct mount *mnt, struct dentry *dentry)
19531953
{
19541954
struct mount *child;
19551955

@@ -1963,6 +1963,16 @@ bool has_locked_children(struct mount *mnt, struct dentry *dentry)
19631963
return false;
19641964
}
19651965

1966+
bool has_locked_children(struct mount *mnt, struct dentry *dentry)
1967+
{
1968+
bool res;
1969+
1970+
read_seqlock_excl(&mount_lock);
1971+
res = __has_locked_children(mnt, dentry);
1972+
read_sequnlock_excl(&mount_lock);
1973+
return res;
1974+
}
1975+
19661976
/**
19671977
* clone_private_mount - create a private clone of a path
19681978
* @path: path to clone
@@ -1985,7 +1995,7 @@ struct vfsmount *clone_private_mount(const struct path *path)
19851995
if (!check_mnt(old_mnt))
19861996
goto invalid;
19871997

1988-
if (has_locked_children(old_mnt, path->dentry))
1998+
if (__has_locked_children(old_mnt, path->dentry))
19891999
goto invalid;
19902000

19912001
new_mnt = clone_mnt(old_mnt, path->dentry, CL_PRIVATE);
@@ -2368,7 +2378,7 @@ static struct mount *__do_loopback(struct path *old_path, int recurse)
23682378
return mnt;
23692379
}
23702380

2371-
if (!recurse && has_locked_children(old, old_path->dentry))
2381+
if (!recurse && __has_locked_children(old, old_path->dentry))
23722382
return mnt;
23732383

23742384
if (recurse)

0 commit comments

Comments
 (0)