Commit 54fb5c9d authored by Anand Jain's avatar Anand Jain Committed by Greg Kroah-Hartman

btrfs: prop: fix vanished compression property after failed set

commit 272e5326 upstream.

The compression property resets to NULL, instead of the old value if we
fail to set the new compression parameter.

  $ btrfs prop get /btrfs compression
    compression=lzo
  $ btrfs prop set /btrfs compression zli
    ERROR: failed to set compression for /btrfs: Invalid argument
  $ btrfs prop get /btrfs compression

This is because the compression property ->validate() is successful for
'zli' as the strncmp() used the length passed from the userspace.

Fix it by using the expected string length in strncmp().

Fixes: 63541927 ("Btrfs: add support for inode properties")
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 fbfbb996
...@@ -366,11 +366,11 @@ int btrfs_subvol_inherit_props(struct btrfs_trans_handle *trans, ...@@ -366,11 +366,11 @@ int btrfs_subvol_inherit_props(struct btrfs_trans_handle *trans,
static int prop_compression_validate(const char *value, size_t len) static int prop_compression_validate(const char *value, size_t len)
{ {
if (!strncmp("lzo", value, len)) if (!strncmp("lzo", value, 3))
return 0; return 0;
else if (!strncmp("zlib", value, len)) else if (!strncmp("zlib", value, 4))
return 0; return 0;
else if (!strncmp("zstd", value, len)) else if (!strncmp("zstd", value, 4))
return 0; return 0;
return -EINVAL; return -EINVAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment