Skip to content

Commit d8df891

Browse files
Al ViroZhengShunQian
Al Viro
authored andcommitted
fix mntput/mntput race
commit 9ea0a46 upstream. mntput_no_expire() does the calculation of total refcount under mount_lock; unfortunately, the decrement (as well as all increments) are done outside of it, leading to false positives in the "are we dropping the last reference" test. Consider the following situation: * mnt is a lazy-umounted mount, kept alive by two opened files. One of those files gets closed. Total refcount of mnt is 2. On CPU 42 mntput(mnt) (called from __fput()) drops one reference, decrementing component * After it has looked at component #0, the process on CPU 0 does mntget(), incrementing component #0, gets preempted and gets to run again - on CPU 69. There it does mntput(), which drops the reference (component hardkernel#69) and proceeds to spin on mount_lock. * On CPU 42 our first mntput() finishes counting. It observes the decrement of component hardkernel#69, but not the increment of component #0. As the result, the total it gets is not 1 as it should've been - it's 0. At which point we decide that vfsmount needs to be killed and proceed to free it and shut the filesystem down. However, there's still another opened file on that filesystem, with reference to (now freed) vfsmount, etc. and we are screwed. It's not a wide race, but it can be reproduced with artificial slowdown of the mnt_get_count() loop, and it should be easier to hit on SMP KVM setups. Fix consists of moving the refcount decrement under mount_lock; the tricky part is that we want (and can) keep the fast case (i.e. mount that still has non-NULL ->mnt_ns) entirely out of mount_lock. All places that zero mnt->mnt_ns are dropping some reference to mnt and they call synchronize_rcu() before that mntput(). IOW, if mntput() observes (under rcu_read_lock()) a non-NULL ->mnt_ns, it is guaranteed that there is another reference yet to be dropped. Reported-by: Jann Horn <[email protected]> Tested-by: Jann Horn <[email protected]> Fixes: 48a066e ("RCU'd vsfmounts") Cc: [email protected] Signed-off-by: Al Viro <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent d7a6a48 commit d8df891

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

fs/namespace.c

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,12 +1142,22 @@ static DECLARE_DELAYED_WORK(delayed_mntput_work, delayed_mntput);
11421142
static void mntput_no_expire(struct mount *mnt)
11431143
{
11441144
rcu_read_lock();
1145-
mnt_add_count(mnt, -1);
1146-
if (likely(mnt->mnt_ns)) { /* shouldn't be the last one */
1145+
if (likely(READ_ONCE(mnt->mnt_ns))) {
1146+
/*
1147+
* Since we don't do lock_mount_hash() here,
1148+
* ->mnt_ns can change under us. However, if it's
1149+
* non-NULL, then there's a reference that won't
1150+
* be dropped until after an RCU delay done after
1151+
* turning ->mnt_ns NULL. So if we observe it
1152+
* non-NULL under rcu_read_lock(), the reference
1153+
* we are dropping is not the final one.
1154+
*/
1155+
mnt_add_count(mnt, -1);
11471156
rcu_read_unlock();
11481157
return;
11491158
}
11501159
lock_mount_hash();
1160+
mnt_add_count(mnt, -1);
11511161
if (mnt_get_count(mnt)) {
11521162
rcu_read_unlock();
11531163
unlock_mount_hash();

0 commit comments

Comments
 (0)