btrfs: check unsupported filters in balance arguments (8eb93459) · Commits · 戴 / test

We don't verify that all the balance filter arguments supplemented by the flags are actually known to the kernel. Thus we let it silently pass and do nothing. At the moment this means only the 'limit' filter, but we're going to add a few more soon so it's better to have that fixed. Also in older stable kernels so that it works with newer userspace tools. Cc: stable@vger.kernel.org # 3.16+ Signed-off-by:

David Sterba <dsterba@suse.com> Signed-off-by:

Chris Mason <clm@fb.com>

fs/btrfs/ioctl.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -4639,6 +4639,11 @@ locked:
		bctl->flags \|= BTRFS_BALANCE_TYPE_MASK;
		}

		if (bctl->flags & ~(BTRFS_BALANCE_ARGS_MASK \| BTRFS_BALANCE_TYPE_MASK)) {
		ret = -EINVAL;
		goto out_bargs;
		}

		do_balance:
		/*
		* Ownership of bctl and mutually_exclusive_operation_running

fs/btrfs/volumes.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -376,6 +376,14 @@ struct map_lookup {
		#define BTRFS_BALANCE_ARGS_VRANGE (1ULL << 4)
		#define BTRFS_BALANCE_ARGS_LIMIT (1ULL << 5)

		#define BTRFS_BALANCE_ARGS_MASK \
		(BTRFS_BALANCE_ARGS_PROFILES \| \
		BTRFS_BALANCE_ARGS_USAGE \| \
		BTRFS_BALANCE_ARGS_DEVID \| \
		BTRFS_BALANCE_ARGS_DRANGE \| \
		BTRFS_BALANCE_ARGS_VRANGE \| \
		BTRFS_BALANCE_ARGS_LIMIT)

		/*
		* Profile changing flags. When SOFT is set we won't relocate chunk if
		* it already has the target profile (even though it may be

Admin message