Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp1397391ybn; Wed, 25 Sep 2019 17:44:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqyCOR0FQGbw2DUDm+qPSgZ6MEnQfEuNZh63f/8FTqsBTL94Ba947sKX2CfhaQ+p73KckARK X-Received: by 2002:a17:906:4c4c:: with SMTP id d12mr863677ejw.174.1569458689538; Wed, 25 Sep 2019 17:44:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569458689; cv=none; d=google.com; s=arc-20160816; b=oBK08qxrm3e3Y/uPNW/R4Hcqt1AWum65GdOXW+gxkxTlWMPY0KPqpKxUif8uznMcZ8 Ou3g6KsaiTc8vZy3W7Dm6dsYkF/AZbX2aLRY6dRpXNZDyyk53s7+8X9hApzDTHsPzxh5 XCNEMxyYTdZ0D/jieX8QsbKGLJwDTR419WFEgJDBSJJrzXAlaEhyZv3BDbXROmKwOhtl mqiXsWn2Evf+B3hDtzVCtfiLKLynACft2r3pwobjarklBjIHd/PwCBC/HVdN4m1kLv63 1BjtST7bXt5WJHd49KwB29hV0zHUg0odQImj+O9Rz9A47eSAPj6aMIpcxcDCViGqGMW/ L69w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:autocrypt:openpgp:from:references:to:subject; bh=FZg5UOpC3070e6wmZUkd2quH7UgPB5jSNBpew4guvyM=; b=LkIRBBrpHfhnLHl3L0Ux5LdpDLSaGuPb0m+87X8PJQNl7FGR9RS5pX64+mW5v237hw 6NIdB+1dJj6z2bdEhBjpcpaNhvQOODn4mFBzKv7gWcaCL5dL0UXDp62NMZCXhNuDaSVU qK5sFURwCD20Jx6EdNueJW2UIg/xU98gX/eztH3bAb1SPzL3rZuIaTena/HHLXV46bN1 0m9b6cbAeedOWRDOMFLEJE9M2gK/A4p95LjEYy7O/JLCcCdbjm8flmcAE/IAavuwwTo0 zzLXc0tZFwkR+R+IF9lUl2qXJmr1oOezBJIIdx/WQ9uV7fcFk8B40lg6OZmYoGoax84E FMIg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k9si436446edb.56.2019.09.25.17.44.26; Wed, 25 Sep 2019 17:44:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2408752AbfIXHBa (ORCPT + 99 others); Tue, 24 Sep 2019 03:01:30 -0400 Received: from mx2.suse.de ([195.135.220.15]:52444 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2388209AbfIXHB3 (ORCPT ); Tue, 24 Sep 2019 03:01:29 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 08C22B63F; Tue, 24 Sep 2019 07:01:27 +0000 (UTC) Subject: Re: [PATCH] btrfs compression: check string length To: Pavel Machek , clm@fb.com, David Sterba , josef@toxicpanda.com, linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org References: <20190924061452.GA31397@amd> From: Nikolay Borisov Openpgp: preference=signencrypt Autocrypt: addr=nborisov@suse.com; prefer-encrypt=mutual; keydata= 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 Message-ID: <0755d158-c219-4d22-f6d4-cb7e5e1cb170@suse.com> Date: Tue, 24 Sep 2019 10:01:25 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20190924061452.GA31397@amd> Content-Type: text/plain; charset=UTF-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 24.09.19 г. 9:14 ч., Pavel Machek wrote: > AFAICT, with current code user could pass something like "lzox" and > still get "lzo" compression. Check string lengths to prevent that. > > Signed-off-by: Pavel Machek > > diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c > index b05b361..1083ab4 100644 > --- a/fs/btrfs/compression.c > +++ b/fs/btrfs/compression.c > @@ -51,7 +51,7 @@ bool btrfs_compress_is_valid_type(const char *str, size_t len) > for (i = 1; i < ARRAY_SIZE(btrfs_compress_types); i++) { > size_t comp_len = strlen(btrfs_compress_types[i]); > > - if (len < comp_len) > + if (len != comp_len) > continue; It's like that so that we can support compression strings such as zlib:9. In fact the initial version was written like you suggest: https://www.mail-archive.com/linux-btrfs@vger.kernel.org/msg88216.html > > if (!strncmp(btrfs_compress_types[i], str, comp_len)) >