Commit b0d3869c authored by Al Viro's avatar Al Viro

propagate_one(): mnt_set_mountpoint() needs mount_lock

... to protect the modification of mp->m_count done by it.  Most of
the places that modify that thing also have namespace_lock held,
but not all of them can do so, so we really need mount_lock here.
Kudos to Piotr Krysiuk <piotras@gmail.com>, who'd spotted a related
bug in pivot_root(2) (fixed unnoticed in 5.3); search for other
similar turds has caught out this one.

Cc: stable@kernel.org
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 3815f1be
...@@ -261,14 +261,13 @@ static int propagate_one(struct mount *m) ...@@ -261,14 +261,13 @@ static int propagate_one(struct mount *m)
child = copy_tree(last_source, last_source->mnt.mnt_root, type); child = copy_tree(last_source, last_source->mnt.mnt_root, type);
if (IS_ERR(child)) if (IS_ERR(child))
return PTR_ERR(child); return PTR_ERR(child);
mnt_set_mountpoint(m, mp, child);
last_dest = m;
last_source = child;
if (m->mnt_master != dest_master) {
read_seqlock_excl(&mount_lock); read_seqlock_excl(&mount_lock);
mnt_set_mountpoint(m, mp, child);
if (m->mnt_master != dest_master)
SET_MNT_MARK(m->mnt_master); SET_MNT_MARK(m->mnt_master);
read_sequnlock_excl(&mount_lock); read_sequnlock_excl(&mount_lock);
} last_dest = m;
last_source = child;
hlist_add_head(&child->mnt_hash, list); hlist_add_head(&child->mnt_hash, list);
return count_mounts(m->mnt_ns, child); return count_mounts(m->mnt_ns, child);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment