Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

btrfs: scrub: reject unsupported scrub flags

Since the introduction of scrub interface, the only flag that we support
is BTRFS_SCRUB_READONLY. Thus there is no sanity checks, if there are
some undefined flags passed in, we just ignore them.

This is problematic if we want to introduce new scrub flags, as we have
no way to determine if such flags are supported.

Address the problem by introducing a check for the flags, and if
unsupported flags are set, return -EOPNOTSUPP to inform the user space.

This check should be backported for all supported kernels before any new
scrub flags are introduced.

CC: stable@vger.kernel.org # 4.14+
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

authored by

Qu Wenruo and committed by
David Sterba
604e6681 f263a7c3

+6
+5
fs/btrfs/ioctl.c
··· 3161 3161 if (IS_ERR(sa)) 3162 3162 return PTR_ERR(sa); 3163 3163 3164 + if (sa->flags & ~BTRFS_SCRUB_SUPPORTED_FLAGS) { 3165 + ret = -EOPNOTSUPP; 3166 + goto out; 3167 + } 3168 + 3164 3169 if (!(sa->flags & BTRFS_SCRUB_READONLY)) { 3165 3170 ret = mnt_want_write_file(file); 3166 3171 if (ret)
+1
include/uapi/linux/btrfs.h
··· 187 187 }; 188 188 189 189 #define BTRFS_SCRUB_READONLY 1 190 + #define BTRFS_SCRUB_SUPPORTED_FLAGS (BTRFS_SCRUB_READONLY) 190 191 struct btrfs_ioctl_scrub_args { 191 192 __u64 devid; /* in */ 192 193 __u64 start; /* in */