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=unavailable 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 97BC7C10F0E for ; Mon, 15 Apr 2019 19:27:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 638C120651 for ; Mon, 15 Apr 2019 19:27:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555356437; bh=qAjLeI4y7mshz633X3144W3Gv1o1XJv8lhRXta9DLvY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=eWB3tAhgLbwphUloFL7JzRYS0NUQCCPrbd5d9Ezdzn950/CloCAX2iGW9n0LiQg7e snzacUEekOK3DjaGe0Zexy9OAACYNAzAJtOoMB0Fw588JcOM/CqMnJ5v/nf5yZG1xp G4oqU5C5QBmbzWN7z7tDHdT+1uLMqLl5o2Q/FI6Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729420AbfDOTED (ORCPT ); Mon, 15 Apr 2019 15:04:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:36590 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728627AbfDOTED (ORCPT ); Mon, 15 Apr 2019 15:04:03 -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 74C542087C; Mon, 15 Apr 2019 19:04:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555355042; bh=qAjLeI4y7mshz633X3144W3Gv1o1XJv8lhRXta9DLvY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AGOYUOFK0WnAkD0z9L4m2nc/sslshcNL3ZyKOQ8IcsMQpCRj85iECthUS4VD9jp7g U0Fj2PYrVgmmonq8WXzv8gkHim8wMzZyi5ThzN4o7QjuXQ1ApT40LL/oK/USMAlkyd l3eLjr2t/0DZG8GZnqKwRPFechZXSPsfwgJCqZEs= 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 47/69] btrfs: prop: fix zstd compression parameter validation Date: Mon, 15 Apr 2019 20:59:05 +0200 Message-Id: <20190415183733.789591359@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 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: 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/btrfs/props.c +++ b/fs/btrfs/props.c @@ -416,7 +416,7 @@ static int prop_compression_apply(struct 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 {