Unverified Commit aa21f333 authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Christian Brauner
Browse files

fs: fix is_mnt_ns_file() 



Commit 1fa08aec ("nsfs: convert to path_from_stashed() helper") reused
nsfs dentry's d_fsdata, which no longer contains a pointer to
proc_ns_operations.

Fix the remaining use in is_mnt_ns_file().

Fixes: 1fa08aec ("nsfs: convert to path_from_stashed() helper")
Cc: stable@vger.kernel.org # v6.9
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
Link: https://lore.kernel.org/r/20241211121118.85268-1-mszeredi@redhat.com


Acked-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 867f8567

fs/namespace.c

+8 −2
Original line number Diff line number Diff line
@@ -2055,9 +2055,15 @@ SYSCALL_DEFINE1(oldumount, char __user *, name) 


static bool is_mnt_ns_file(struct dentry *dentry)

{

	struct ns_common *ns;



	/* Is this a proxy for a mount namespace? */

	return dentry->d_op == &ns_dentry_operations &&

	       dentry->d_fsdata == &mntns_operations;

	if (dentry->d_op != &ns_dentry_operations)

		return false;



	ns = d_inode(dentry)->i_private;



	return ns->ops == &mntns_operations;

}



struct ns_common *from_mnt_ns(struct mnt_namespace *mnt)