do_move_mount(): don't leak MNTNS_PROPAGATING on failures

as it is, a failed move_mount(2) from anon namespace breaks
all further propagation into that namespace, including normal
mounts in non-anon namespaces that would otherwise propagate
there.

Fixes: 064fe6e233e8 ("mount: handle mount propagation for detached mount trees")
Reviewed-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/namespace.c b/fs/namespace.c
index d8a344d0a80aabb0f2c8cabb17fa3eff2c6a913b..04a9bb9f31fad1e6b2c84a6cd5a42649bb2c379a 100644 (file)
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -3715,15 +3715,14 @@ static int do_move_mount(struct path *old_path,
        if (err)
                goto out;
 
-       if (is_anon_ns(ns))
-               ns->mntns_flags &= ~MNTNS_PROPAGATING;
-
        /* if the mount is moved, it should no longer be expire
         * automatically */
        list_del_init(&old->mnt_expire);
        if (attached)
                put_mountpoint(old_mp);
 out:
+       if (is_anon_ns(ns))
+               ns->mntns_flags &= ~MNTNS_PROPAGATING;
        unlock_mount(mp);
        if (!err) {
                if (attached) {