diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2014-10-07 16:22:52 -0700 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-04-23 09:24:42 +0200 |
| commit | d26388bb266798547bb0314acc1b222119c1db93 (patch) | |
| tree | ee1c55c41c8e8985572e1d72d50ac8a0e3e798e1 /fs | |
| parent | cf9d5808b7a0e8c88cb3a5d198865567e08c03ea (diff) | |
mnt: Move the clear of MNT_LOCKED from copy_tree to it's callers.
commit 8486a7882b5ba906992fd78bbfcefaae7fe285cc upstream.
Clear MNT_LOCKED in the callers of copy_tree except copy_mnt_ns, and
collect_mounts. In copy_mnt_ns it is necessary to create an exact
copy of a mount tree, so not clearing MNT_LOCKED is important.
Similarly collect_mounts is used to take a snapshot of the mount tree
for audit logging purposes and auditing using a faithful copy of the
tree is important.
This becomes particularly significant when we start setting MNT_LOCKED
on rootfs to prevent it from being unmounted.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: NeilBrown <neilb@suse.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/namespace.c | 1 | ||||
| -rw-r--r-- | fs/pnode.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index d727b0ce11df..f67473272010 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -1416,7 +1416,6 @@ struct mount *copy_tree(struct mount *mnt, struct dentry *dentry, if (IS_ERR(q)) return q; - q->mnt.mnt_flags &= ~MNT_LOCKED; q->mnt_mountpoint = mnt->mnt_mountpoint; p = mnt; diff --git a/fs/pnode.c b/fs/pnode.c index 9af0df15256e..509d046e2b3e 100644 --- a/fs/pnode.c +++ b/fs/pnode.c @@ -249,6 +249,7 @@ int propagate_mnt(struct mount *dest_mnt, struct mountpoint *dest_mp, list_splice(tree_list, tmp_list.prev); goto out; } + child->mnt.mnt_flags &= ~MNT_LOCKED; if (is_subdir(dest_mp->m_dentry, m->mnt.mnt_root)) { mnt_set_mountpoint(m, dest_mp, child); |