On Fri, Aug 01, 2014 at 02:12:24PM -0400, Richard Yao wrote:
> `mount -o bind,ro ...` suffers from a silent failure where the readonly
> flag is ignored. The bind mount will be created rw whenever the target
> is rw. Users typically workaround this by remounting readonly, but that
> does not work when you want to define readonly bind mounts in fstab.
> This is a major annoyance when dealing with recursive bind mounts
> because the userland mount command does not expose the option to
> recursively remount a subtree as readonly.
>
> Signed-off-by: Richard Yao <r...@gentoo.org>
> ---
> fs/namespace.c | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/fs/namespace.c b/fs/namespace.c
> index 182bc41..0d23525 100644
> --- a/fs/namespace.c
> +++ b/fs/namespace.c
> @@ -1827,11 +1827,12 @@ static bool has_locked_children(struct mount *mnt,
> struct dentry *dentry)
> * do loopback mount.
> */
> static int do_loopback(struct path *path, const char *old_name,
> - int recurse)
> + unsigned long flags)
> {
> struct path old_path;
> - struct mount *mnt = NULL, *old, *parent;
> + struct mount *mnt = NULL, *old, *parent, *m;
> struct mountpoint *mp;
> + int recurse = flags & MS_REC;
> int err;
> if (!old_name || !*old_name)
> return -EINVAL;
> @@ -1871,6 +1872,10 @@ static int do_loopback(struct path *path, const char
> *old_name,
> goto out2;
> }
>
> + if (flags & MS_RDONLY)
> + for (m = mnt; m; m = (recurse ? next_mnt(m, mnt) : NULL))
> + mnt_make_readonly(m);
> +
> mnt->mnt.mnt_flags &= ~MNT_LOCKED;
>
> err = graft_tree(mnt, parent, mp);
> @@ -2444,7 +2449,8 @@ long do_mount(const char *dev_name, const char
> *dir_name,
> retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
> data_page);
> else if (flags & MS_BIND)
> - retval = do_loopback(&path, dev_name, flags & MS_REC);
> + retval = do_loopback(&path, dev_name, flags & (MS_REC |
> + MS_RDONLY));
> else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
> retval = do_change_type(&path, flags);
> else if (flags & MS_MOVE)
I don't really know this code, but have to ask.
Would not it be much better to pass down info about rdonly request to
copy_tree/clone_mnt (perhaps CL_MOUNT_RDONLY flag or a separate flags
argument) and handle it there?
This would avoid fishy-looking traversal before graft_tree, which even
if correct should not be necessary.
--
Mateusz Guzik
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
