btrfs: prop: fix vanished compression property after failed set [Linux 4.19.35]

btrfs: prop: fix vanished compression property after failed set [Linux 4.19.35]

This Linux kernel change "btrfs: prop: fix vanished compression property after failed set" is included in the Linux 4.19.35 release. This change is authored by Anand Jain <anand.jain [at] oracle.com> on Tue Apr 2 18:07:40 2019 +0800. The commit for this change in Linux stable tree is 54fb5c9 (patch) which is from upstream commit 272e532. The same Linux upstream change may have been applied to various maintained Linux releases and you can find all Linux releases containing changes from upstream 272e532.

btrfs: prop: fix vanished compression property after failed set

commit 272e5326c7837697882ce3162029ba893059b616 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: 63541927c8d1 ("Btrfs: add support for inode properties")
Fixes: 5c1aab1dd544 ("btrfs: Add zstd support")
CC: stable@vger.kernel.org # 4.14+
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

There are 6 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 fs/btrfs/props.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/btrfs/props.c b/fs/btrfs/props.c
index fd19f30..61d22a5 100644
--- a/fs/btrfs/props.c
+++ b/fs/btrfs/props.c
@@ -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)
 {
-   if (!strncmp("lzo", value, len))
+   if (!strncmp("lzo", value, 3))
        return 0;
-   else if (!strncmp("zlib", value, len))
+   else if (!strncmp("zlib", value, 4))
        return 0;
-   else if (!strncmp("zstd", value, len))
+   else if (!strncmp("zstd", value, 4))
        return 0;

    return -EINVAL;

Leave a Reply

Your email address will not be published. Required fields are marked *