Skip to content

Commit 250cf36

Browse files
author
Al Viro
committed
__legitimize_mnt(): check for MNT_SYNC_UMOUNT should be under mount_lock
... or we risk stealing final mntput from sync umount - raising mnt_count after umount(2) has verified that victim is not busy, but before it has set MNT_SYNC_UMOUNT; in that case __legitimize_mnt() doesn't see that it's safe to quietly undo mnt_count increment and leaves dropping the reference to caller, where it'll be a full-blown mntput(). Check under mount_lock is needed; leaving the current one done before taking that makes no sense - it's nowhere near common enough to bother with. Reviewed-by: Christian Brauner <brauner@kernel.org> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
1 parent 92a09c4 commit 250cf36

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

fs/namespace.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -790,12 +790,8 @@ int __legitimize_mnt(struct vfsmount *bastard, unsigned seq)
790790
smp_mb(); // see mntput_no_expire()
791791
if (likely(!read_seqretry(&mount_lock, seq)))
792792
return 0;
793-
if (bastard->mnt_flags & MNT_SYNC_UMOUNT) {
794-
mnt_add_count(mnt, -1);
795-
return 1;
796-
}
797793
lock_mount_hash();
798-
if (unlikely(bastard->mnt_flags & MNT_DOOMED)) {
794+
if (unlikely(bastard->mnt_flags & (MNT_SYNC_UMOUNT | MNT_DOOMED))) {
799795
mnt_add_count(mnt, -1);
800796
unlock_mount_hash();
801797
return 1;

0 commit comments

Comments
 (0)