On Wed, 2021-03-03 at 18:28 +0300, Alexander Mikhalitsyn wrote:
> It was discovered that find_autofs_mount() function
> in autofs not support cases when autofs mount
> parent is overmounted. In this case this function will
> always return -ENOENT.
Ok, I get this shouldn't happen.
>
> Real-life reproducer is fairly simple.
> Consider the following mounts on root mntns:
> --
> 35 24 0:36 / /proc/sys/fs/binfmt_misc ... shared:16 - autofs systemd-
> 1 ...
> 654 35 0:57 / /proc/sys/fs/binfmt_misc ... shared:322 - binfmt_misc
> ...
> --
> and some process which calls ioctl(AUTOFS_DEV_IOCTL_OPENMOUNT)
> $ unshare -m -p --fork --mount-proc ./process-bin
>
> Due to "mount-proc" /proc will be overmounted and
> ioctl() will fail with -ENOENT
I think I need a better explanation ...
What's being said here?
For a start your talking about direct mounts, I'm pretty sure this
use case can't occur with indirect mounts in the sense that the
indirect mount base should/must never be over mounted and IIRC that
base can't be /proc (but maybe that's just mounts inside proc ...),
can't remember now but from a common sense POV an indirect mount
won't/can't be on /proc.
And why is this ioctl be called?
If the mount is over mounted should that prevent expiration of the
over mounted /proc anyway, so maybe the return is correct ... or
not ...
I get that the mount namespaces should be independent and intuitively
this is a bug but what is the actual use and expected result.
But anyway, aren't you saying that the VFS path walk isn't handling
mount namespaces properly or are you saying that a process outside
this new mount namespace becomes broken because of it?
Either way the solution looks more complicated than I'd expect so
some explanation along these lines would be good.
Ian
>
> Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx>
> Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
> Cc: Pavel Tikhomirov <ptikhomirov@xxxxxxxxxxxxx>
> Cc: Kirill Tkhai <ktkhai@xxxxxxxxxxxxx>
> Cc: autofs@xxxxxxxxxxxxxxx
> Cc: linux-kernel@xxxxxxxxxxxxxxx
> Signed-off-by: Alexander Mikhalitsyn <
> alexander.mikhalitsyn@xxxxxxxxxxxxx>
> ---
> fs/autofs/dev-ioctl.c | 127 +++++++++++++++++++++++++++++++++++++---
> --
> fs/namespace.c | 44 +++++++++++++++
> include/linux/mount.h | 5 ++
> 3 files changed, 162 insertions(+), 14 deletions(-)
>
> diff --git a/fs/autofs/dev-ioctl.c b/fs/autofs/dev-ioctl.c
> index 5bf781ea6d67..55edd3eba8ce 100644
> --- a/fs/autofs/dev-ioctl.c
> +++ b/fs/autofs/dev-ioctl.c
> @@ -10,6 +10,7 @@
> #include <linux/fdtable.h>
> #include <linux/magic.h>
> #include <linux/nospec.h>
> +#include <linux/nsproxy.h>
>
> #include "autofs_i.h"
>
> @@ -179,32 +180,130 @@ static int autofs_dev_ioctl_protosubver(struct
> file *fp,
> return 0;
> }
>
> +struct filter_autofs_data {
> + char *pathbuf;
> + const char *fpathname;
> + int (*test)(const struct path *path, void *data);
> + void *data;
> +};
> +
> +static int filter_autofs(const struct path *path, void *p)
> +{
> + struct filter_autofs_data *data = p;
> + char *name;
> + int err;
> +
> + if (path->mnt->mnt_sb->s_magic != AUTOFS_SUPER_MAGIC)
> + return 0;
> +
> + name = d_path(path, data->pathbuf, PATH_MAX);
> + if (IS_ERR(name)) {
> + err = PTR_ERR(name);
> + pr_err("d_path failed, errno %d\n", err);
> + return 0;
> + }
> +
> + if (strncmp(data->fpathname, name, PATH_MAX))
> + return 0;
> +
> + if (!data->test(path, data->data))
> + return 0;
> +
> + return 1;
> +}
> +
> /* Find the topmost mount satisfying test() */
> static int find_autofs_mount(const char *pathname,
> struct path *res,
> int test(const struct path *path, void
> *data),
> void *data)
> {
> - struct path path;
> + struct filter_autofs_data mdata = {
> + .pathbuf = NULL,
> + .test = test,
> + .data = data,
> + };
> + struct mnt_namespace *mnt_ns = current->nsproxy->mnt_ns;
> + struct path path = {};
> + char *fpathbuf = NULL;
> int err;
>
> + /*
> + * In most cases user will provide full path to autofs mount
> point
> + * as it is in /proc/X/mountinfo. But if not, then we need to
> + * open provided relative path and calculate full path.
> + * It will not work in case when parent mount of autofs mount
> + * is overmounted:
> + * cd /root
> + * ./autofs_mount /root/autofs_yard/mnt
> + * mount -t tmpfs tmpfs /root/autofs_yard/mnt
> + * mount -t tmpfs tmpfs /root/autofs_yard
> + * ./call_ioctl /root/autofs_yard/mnt <- all fine here because
> we
> + * have full path and
> don't
> + * need to call
> kern_path()
> + * and d_path()
> + * ./call_ioctl autofs_yard/mnt <- will fail because
> kern_path()
> + * can't lookup
> /root/autofs_yard/mnt
> + * (/root/autofs_yard
> directory is
> + * empty)
> + *
> + * TO DISCUSS: we can write special algorithm for relative path
> case
> + * by getting cwd path combining it with relative path from
> user. But
> + * is it worth it? User also may use paths with symlinks in
> components
> + * of path.
> + *
> + */
> err = kern_path(pathname, LOOKUP_MOUNTPOINT, &path);
> - if (err)
> - return err;
> - err = -ENOENT;
> - while (path.dentry == path.mnt->mnt_root) {
> - if (path.dentry->d_sb->s_magic == AUTOFS_SUPER_MAGIC) {
> - if (test(&path, data)) {
> - path_get(&path);
> - *res = path;
> - err = 0;
> - break;
> - }
> + if (err) {
> + if (pathname[0] == '/') {
> + /*
> + * pathname looks like full path let's try to
> use it
> + * as it is when searching autofs mount
> + */
> + mdata.fpathname = pathname;
> + err = 0;
> + pr_debug("kern_path failed on %s, errno %d.
> Will use path as it is to search mount\n",
> + pathname, err);
> + } else {
> + pr_err("kern_path failed on %s, errno %d\n",
> + pathname, err);
> + return err;
> + }
> + } else {
> + pr_debug("find_autofs_mount: let's resolve full path
> %s\n",
> + pathname);
> +
> + fpathbuf = kmalloc(PATH_MAX, GFP_KERNEL);
> + if (!fpathbuf) {
> + err = -ENOMEM;
> + goto err;
> + }
> +
> + /*
> + * We have pathname from user but it may be relative,
> we need to
> + * have full path because we want to compare it with
> mountpoints
> + * paths later.
> + */
> + mdata.fpathname = d_path(&path, fpathbuf, PATH_MAX);
> + if (IS_ERR(mdata.fpathname)) {
> + err = PTR_ERR(mdata.fpathname);
> + pr_err("d_path failed, errno %d\n", err);
> + goto err;
> }
> - if (!follow_up(&path))
> - break;
> }
> +
> + mdata.pathbuf = kmalloc(PATH_MAX, GFP_KERNEL);
> + if (!mdata.pathbuf) {
> + err = -ENOMEM;
> + goto err;
> + }
> +
> + err = lookup_mount_path(mnt_ns, res, filter_autofs, &mdata);
> +
> +err:
> path_put(&path);
> + kfree(fpathbuf);
> + kfree(mdata.pathbuf);
> return err;
> }
>
> diff --git a/fs/namespace.c b/fs/namespace.c
> index 56bb5a5fdc0d..e1d006dbdfe2 100644
> --- a/fs/namespace.c
> +++ b/fs/namespace.c
> @@ -1367,6 +1367,50 @@ void mnt_cursor_del(struct mnt_namespace *ns,
> struct mount *cursor)
> }
> #endif /* CONFIG_PROC_FS */
>
> +/**
> + * lookup_mount_path - traverse all mounts in mount namespace
> + * and filter using test() probe callback
> + * As a result struct path will be provided.
> + * @ns: root of mount tree
> + * @res: struct path pointer where resulting path will be written
> + * @test: filter callback
> + * @data: will be provided as argument to test() callback
> + *
> + */
> +int lookup_mount_path(struct mnt_namespace *ns,
> + struct path *res,
> + int test(const struct path *mnt, void *data),
> + void *data)
> +{
> + struct mount *mnt;
> + int err = -ENOENT;
> +
> + down_read(&namespace_sem);
> + lock_ns_list(ns);
> + list_for_each_entry(mnt, &ns->list, mnt_list) {
> + struct path tmppath;
> +
> + if (mnt_is_cursor(mnt))
> + continue;
> +
> + tmppath.dentry = mnt->mnt.mnt_root;
> + tmppath.mnt = &mnt->mnt;
> +
> + if (test(&tmppath, data)) {
> + path_get(&tmppath);
> + *res = tmppath;
> + err = 0;
> + break;
> + }
> + }
> + unlock_ns_list(ns);
> + up_read(&namespace_sem);
> +
> + return err;
> +}
> +
> +EXPORT_SYMBOL(lookup_mount_path);
> +
> /**
> * may_umount_tree - check if a mount tree is busy
> * @mnt: root of mount tree
> diff --git a/include/linux/mount.h b/include/linux/mount.h
> index 5d92a7e1a742..a79e6392e38e 100644
> --- a/include/linux/mount.h
> +++ b/include/linux/mount.h
> @@ -118,6 +118,11 @@ extern unsigned int sysctl_mount_max;
>
> extern bool path_is_mountpoint(const struct path *path);
>
> +extern int lookup_mount_path(struct mnt_namespace *ns,
> + struct path *res,
> + int test(const struct path *mnt, void
> *data),
> + void *data);
> +
> extern void kern_unmount_array(struct vfsmount *mnt[], unsigned int
> num);
>
> #endif /* _LINUX_MOUNT_H */
