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

Commit fbfbb996 authored by Anand Jain's avatar Anand Jain Committed by Greg Kroah-Hartman
Browse files

btrfs: prop: fix zstd compression parameter validation 



commit 50398fde997f6be8faebdb5f38e9c9c467370f51 upstream.

We let pass zstd compression parameter even if it is not fully valid.
For example:

  $ btrfs prop set /btrfs compression zst
  $ btrfs prop get /btrfs compression
     compression=zst

zlib and lzo are fine.

Fix it by checking the correct prefix length.

Fixes: 5c1aab1d ("btrfs: Add zstd support")
CC: stable@vger.kernel.org # 4.14+
Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarAnand Jain <anand.jain@oracle.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 16515acd

fs/btrfs/props.c

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ static int prop_compression_apply(struct inode *inode, 
		btrfs_set_fs_incompat(fs_info, COMPRESS_LZO);

	} else if (!strncmp("zlib", value, 4)) {

		type = BTRFS_COMPRESS_ZLIB;

	} else if (!strncmp("zstd", value, len)) {

	} else if (!strncmp("zstd", value, 4)) {

		type = BTRFS_COMPRESS_ZSTD;

		btrfs_set_fs_incompat(fs_info, COMPRESS_ZSTD);

	} else {