From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B51B7C10F12 for ; Mon, 15 Apr 2019 19:04:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8174C218FE for ; Mon, 15 Apr 2019 19:04:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555355047; bh=rKpTxdeomcGyDiOx+zPArMqjPIXal4NVG14FKgCkhME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=O1Gq8+NCyzCXgq+4HmQYUxX01oP5Fbvts12q6vEx87RukMbGBTY3xzqZqiXFN7No6 YnVeemmhPmYOm1AnhedD7D1HZpEGgDL1WKjWoNKBE+sPPrc+uuIwAnfR46n4c01AOJ 5GDYiSay5P9Y+HW6aaoEr9UDv5tP2UsRFnrLGOLY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728627AbfDOTEG (ORCPT ); Mon, 15 Apr 2019 15:04:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:36658 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729442AbfDOTEG (ORCPT ); Mon, 15 Apr 2019 15:04:06 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 067E9218A1; Mon, 15 Apr 2019 19:04:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555355045; bh=rKpTxdeomcGyDiOx+zPArMqjPIXal4NVG14FKgCkhME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=As/i/ke5Vos5aVJdn5HdW8+hmzwqkEuk04uzHYjcMwlKT+rEC+Iwb4I1Pjg26OMyh rcETlB6qt6i+MMqGk7YGWRXoLaX+Jp6cRobA6lDL1/SSzgwuUZHTz4/ykxJDcE0Osg QqYFdnTjriMBhObhxVEtzSb+R4OgObTSRHqBOSl8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nikolay Borisov , Anand Jain , David Sterba Subject: [PATCH 4.14 48/69] btrfs: prop: fix vanished compression property after failed set Date: Mon, 15 Apr 2019 20:59:06 +0200 Message-Id: <20190415183733.955422129@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190415183726.036654568@linuxfoundation.org> References: <20190415183726.036654568@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Anand Jain 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 Signed-off-by: Anand Jain Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/props.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/fs/btrfs/props.c +++ b/fs/btrfs/props.c @@ -386,11 +386,11 @@ int btrfs_subvol_inherit_props(struct bt 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;