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

Commit 69a08762 authored by Qu Wenruo's avatar Qu Wenruo Committed by Greg Kroah-Hartman
Browse files

btrfs: defrag: reject unknown flags of btrfs_ioctl_defrag_range_args 



commit 173431b274a9a54fc10b273b46e67f46bcf62d2e upstream.

Add extra sanity check for btrfs_ioctl_defrag_range_args::flags.

This is not really to enhance fuzzing tests, but as a preparation for
future expansion on btrfs_ioctl_defrag_range_args.

In the future we're going to add new members, allowing more fine tuning
for btrfs defrag.  Without the -ENONOTSUPP error, there would be no way
to detect if the kernel supports those new defrag features.

CC: stable@vger.kernel.org # 4.14+
Reviewed-by: default avatarFilipe Manana <fdmanana@suse.com>
Signed-off-by: default avatarQu Wenruo <wqu@suse.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 d0bf04c9

fs/btrfs/ioctl.c

+4 −0
Original line number Diff line number Diff line
@@ -3102,6 +3102,10 @@ static int btrfs_ioctl_defrag(struct file *file, void __user *argp) 
				kfree(range);

				goto out;

			}

			if (range->flags & ~BTRFS_DEFRAG_RANGE_FLAGS_SUPP) {

				ret = -EOPNOTSUPP;

				goto out;

			}

			/* compression requires us to start the IO */

			if ((range->flags & BTRFS_DEFRAG_RANGE_COMPRESS)) {

				range->flags |= BTRFS_DEFRAG_RANGE_START_IO;

include/uapi/linux/btrfs.h

+3 −0
Original line number Diff line number Diff line
@@ -539,6 +539,9 @@ struct btrfs_ioctl_clone_range_args { 
 */

#define BTRFS_DEFRAG_RANGE_COMPRESS 1

#define BTRFS_DEFRAG_RANGE_START_IO 2

#define BTRFS_DEFRAG_RANGE_FLAGS_SUPP	(BTRFS_DEFRAG_RANGE_COMPRESS |		\

					 BTRFS_DEFRAG_RANGE_START_IO)



struct btrfs_ioctl_defrag_range_args {

	/* start of the defrag operation */

	__u64 start;