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

Commit f11525d7 authored by satoru takeuchi's avatar satoru takeuchi Committed by Greg Kroah-Hartman
Browse files

btrfs: prevent to set invalid default subvolid 



commit 6d6d282932d1a609e60dc4467677e0e863682f57 upstream.

`btrfs sub set-default` succeeds to set an ID which isn't corresponding to any
fs/file tree. If such the bad ID is set to a filesystem, we can't mount this
filesystem without specifying `subvol` or `subvolid` mount options.

Fixes: 6ef5ed0d ("Btrfs: add ioctl and incompat flag to set the default mount subvol")
Signed-off-by: default avatarSatoru Takeuchi <satoru.takeuchi@gmail.com>
Reviewed-by: default avatarQu Wenruo <quwenruo.btrfs@gmx.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ba44bc49

fs/btrfs/ioctl.c

+4 −0
Original line number Diff line number Diff line
@@ -4082,6 +4082,10 @@ static long btrfs_ioctl_default_subvol(struct file *file, void __user *argp) 
		ret = PTR_ERR(new_root);

		goto out;

	}

	if (!is_fstree(new_root->objectid)) {

		ret = -ENOENT;

		goto out;

	}



	path = btrfs_alloc_path();

	if (!path) {