Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 863fa888 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull vfs umount_tree() leak fix from Al Viro:
 "Fix braino introduced in 'switch the remnants of releasing the
  mountpoint away from fs_pin'.

  The most visible result is leaking struct mount when mounting btrfs,
  making it impossible to shut down"

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix the struct mount leak in umount_tree()
parents 04412819 19a1c409

fs/namespace.c

+2 −2
Original line number Diff line number Diff line
@@ -1463,7 +1463,6 @@ static void umount_tree(struct mount *mnt, enum umount_tree_flags how) 
			p->mnt.mnt_flags |= MNT_SYNC_UMOUNT;



		disconnect = disconnect_mount(p, how);



		if (mnt_has_parent(p)) {

			mnt_add_count(p->mnt_parent, -1);

			if (!disconnect) {
@@ -1471,10 +1470,11 @@ static void umount_tree(struct mount *mnt, enum umount_tree_flags how) 
				list_add_tail(&p->mnt_child, &p->mnt_parent->mnt_mounts);

			} else {

				umount_mnt(p);

				hlist_add_head(&p->mnt_umount, &unmounted);

			}

		}

		change_mnt_propagation(p, MS_PRIVATE);

		if (disconnect)

			hlist_add_head(&p->mnt_umount, &unmounted);

	}

}