Commit 0e389834 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-6.7-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux 

Pull btrfs fix from David Sterba:
 "One more fix that verifies that the snapshot source is a root, same
  check is also done in user space but should be done by the ioctl as
  well"

* tag 'for-6.7-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: do not allow non subvolume root targets for snapshot
parents accc98af a8892fd7

fs/btrfs/ioctl.c

+9 −0
Original line number Diff line number Diff line
@@ -1290,6 +1290,15 @@ static noinline int __btrfs_ioctl_snap_create(struct file *file, 
			 * are limited to own subvolumes only

			 */

			ret = -EPERM;

		} else if (btrfs_ino(BTRFS_I(src_inode)) != BTRFS_FIRST_FREE_OBJECTID) {

			/*

			 * Snapshots must be made with the src_inode referring

			 * to the subvolume inode, otherwise the permission

			 * checking above is useless because we may have

			 * permission on a lower directory but not the subvol

			 * itself.

			 */

			ret = -EINVAL;

		} else {

			ret = btrfs_mksnapshot(&file->f_path, idmap,

					       name, namelen,