]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
fhandle: reject detached mounts in capable_wrt_mount()
authorDavid Lee <david.lee@trailofbits.com>
Wed, 1 Jul 2026 11:44:28 +0000 (11:44 +0000)
committerChristian Brauner <brauner@kernel.org>
Wed, 1 Jul 2026 13:26:32 +0000 (15:26 +0200)
The recent fhandle RCU fix moved the mount namespace capability check
into capable_wrt_mount(), so a non-NULL mnt_namespace survives the
ns_capable() dereference. The helper still assumes the later
READ_ONCE(mount->mnt_ns) must be non-NULL because may_decode_fh()
checked is_mounted() first.

That assumption is not stable. A detached mount from
open_tree(..., OPEN_TREE_CLONE) can be dissolved on fput while
open_by_handle_at() is between those checks, and umount_tree() can
clear mount->mnt_ns. If the helper observes NULL, it dereferences
mnt_ns->user_ns and panics.

Return false when the RCU read observes a detached mount. This keeps
the relaxed permission path conservative: a mount no longer attached
to a namespace cannot authorize open_by_handle_at() access.

Fixes: 620c266f3949 ("fhandle: relax open_by_handle_at() permission checks")
Cc: stable@vger.kernel.org
Signed-off-by: David Lee <david.lee@trailofbits.com>
Assisted-by: LLM
Link: https://patch.msgid.link/20260701114438.24431-1-david.lee@trailofbits.com
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Christian Brauner (Amutable) <brauner@kernel.org>
fs/fhandle.c

index 1ca7eb3a6cb51655d4198e0b931ba55cdf7d819f..f8829231e3d758ee0a620ff45a6f24a3b21d5734 100644 (file)
@@ -295,7 +295,7 @@ static bool capable_wrt_mount(struct mount *mount)
         */
        guard(rcu)();
        mnt_ns = READ_ONCE(mount->mnt_ns);
-       return ns_capable(mnt_ns->user_ns, CAP_SYS_ADMIN);
+       return mnt_ns && ns_capable(mnt_ns->user_ns, CAP_SYS_ADMIN);
 }
 
 static inline int may_decode_fh(struct handle_to_path_ctx *ctx,