From: David Sterba <dsterba@suse.cz>
To: Daniel Vacek <neelx@suse.com>
Cc: Chris Mason <clm@fb.com>, Josef Bacik <josef@toxicpanda.com>,
David Sterba <dsterba@suse.com>, Nick Terrell <terrelln@fb.com>,
linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] btrfs: harden parsing of compress mount option
Date: Wed, 23 Apr 2025 12:24:46 +0200 [thread overview]
Message-ID: <20250423102446.GF3659@twin.jikos.cz> (raw)
In-Reply-To: <20250423073329.4021878-1-neelx@suse.com>
On Wed, Apr 23, 2025 at 09:33:28AM +0200, Daniel Vacek wrote:
> Btrfs happily but incorrectly accepts the `-o compress=zlib+foo` and similar
> options with any random suffix. Let's handle that correctly.
>
> Signed-off-by: Daniel Vacek <neelx@suse.com>
> ---
> fs/btrfs/super.c | 21 +++++++++++++++++----
> 1 file changed, 17 insertions(+), 4 deletions(-)
>
> diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
> index 40709e2a44fce..f7e064b8c6d88 100644
> --- a/fs/btrfs/super.c
> +++ b/fs/btrfs/super.c
> @@ -354,7 +354,10 @@ static int btrfs_parse_param(struct fs_context *fc, struct fs_parameter *param)
> btrfs_set_opt(ctx->mount_opt, COMPRESS);
> btrfs_clear_opt(ctx->mount_opt, NODATACOW);
> btrfs_clear_opt(ctx->mount_opt, NODATASUM);
> - } else if (strncmp(param->string, "zlib", 4) == 0) {
> + } else if (strncmp(param->string, "zlib", 4) == 0 &&
> + (param->string[4] == ':' ||
> + param->string[4] == ',' ||
Can there be ',' in the string? The option parser splits the options at
exactly that so it won't be part of the string, so just ':' or 0.
> + param->string[4] == '\0')) {
> ctx->compress_type = BTRFS_COMPRESS_ZLIB;
> ctx->compress_level =
> btrfs_compress_str2level(BTRFS_COMPRESS_ZLIB,
next prev parent reply other threads:[~2025-04-23 10:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-23 7:33 Daniel Vacek
2025-04-23 10:24 ` David Sterba [this message]
2025-04-23 10:29 ` David Sterba
2025-04-23 13:22 ` [PATCH v2] " Daniel Vacek
2025-04-24 19:29 ` David Sterba
2025-05-28 23:28 ` David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250423102446.GF3659@twin.jikos.cz \
--to=dsterba@suse.cz \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=josef@toxicpanda.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=neelx@suse.com \
--cc=terrelln@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®