Empty mount namespaces created with CLONE_EMPTY_MNTNS start with only an internal nullfs root mount until a real root filesystem is mounted over it, and external callers have no helper to resolve the live root path of an unentered mount namespace. Add mnt_ns_get_root() to look up "/" with LOOKUP_DOWN from the mount namespace's base root mount and return -ENOENT if no filesystem has been mounted over the initial nullfs root yet. Co-developed-by: David Howells Signed-off-by: David Howells Signed-off-by: Jarkko Sakkinen --- fs/namespace.c | 16 ++++++++++++++++ include/linux/mnt_namespace.h | 2 ++ 2 files changed, 18 insertions(+) diff --git a/fs/namespace.c b/fs/namespace.c index aecd05ac0170..781380945d78 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -6708,6 +6708,22 @@ static void mntns_put(struct ns_common *ns) put_mnt_ns(to_mnt_ns(ns)); } +int mnt_ns_get_root(struct mnt_namespace *mnt_ns, struct path *root) +{ + int err; + + err = vfs_path_lookup(mnt_ns->root->mnt.mnt_root, &mnt_ns->root->mnt, + "/", LOOKUP_DOWN, root); + if (err) + return err; + if (root->mnt == &mnt_ns->root->mnt) { + path_put(root); + *root = (struct path){}; + return -ENOENT; + } + return 0; +} + static int mntns_install(struct nsset *nsset, struct ns_common *ns) { struct nsproxy *nsproxy = nsset->nsproxy; diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h index 0acd1089d149..98188d1f7428 100644 --- a/include/linux/mnt_namespace.h +++ b/include/linux/mnt_namespace.h @@ -8,6 +8,7 @@ struct mnt_namespace; struct fs_struct; +struct path; struct user_namespace; struct ns_common; @@ -15,6 +16,7 @@ extern struct mnt_namespace init_mnt_ns; extern struct mnt_namespace *copy_mnt_ns(u64, struct mnt_namespace *, struct user_namespace *, struct fs_struct *); +int mnt_ns_get_root(struct mnt_namespace *mnt_ns, struct path *root); extern void put_mnt_ns(struct mnt_namespace *ns); DEFINE_FREE(put_mnt_ns, struct mnt_namespace *, if (!IS_ERR_OR_NULL(_T)) put_mnt_ns(_T)) extern struct ns_common *from_mnt_ns(struct mnt_namespace *); -- 2.47.3