[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250319214900.25100-1-kernel@bareminimum.eu>
Date: Wed, 19 Mar 2025 22:49:00 +0100
From: Johannes Kimmel <kernel@...eminimum.eu>
To: linux-btrfs@...r.kernel.org
Cc: clm@...com,
josef@...icpanda.com,
dsterba@...e.com,
linux-kernel@...r.kernel.org,
Calvin Walton <calvin.walton@...stin.ca>
Subject: [PATCH] btrfs: correctly escape subvol in btrfs_show_options
Currently, displaying the btrfs subvol mount option doesn't escape `,`.
This makes parsing /proc/self/mounts and /proc/self/mountinfo
ambigious for subvolume names that contain commas. The text after the
comma could be mistaken for another option (think "subvol=foo,ro", where
ro is actually part of the subvolumes name).
This patch replaces the manual escape characters list with a call to
seq_show_option. Thanks to Calvin Walton for suggesting this approach.
Fixes: c8d3fe028f64 ("Btrfs: show subvol= and subvolid= in /proc/mounts")
Suggested-by: Calvin Walton <calvin.walton@...stin.ca>
Signed-off-by: Johannes Kimmel <kernel@...eminimum.eu>
---
fs/btrfs/super.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index dc4fee519ca6..a5f29ff3fbc2 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -1139,8 +1139,7 @@ static int btrfs_show_options(struct seq_file *seq, struct dentry *dentry)
subvol_name = btrfs_get_subvol_name_from_objectid(info,
btrfs_root_id(BTRFS_I(d_inode(dentry))->root));
if (!IS_ERR(subvol_name)) {
- seq_puts(seq, ",subvol=");
- seq_escape(seq, subvol_name, " \t\n\\");
+ seq_show_option(seq, "subvol", subvol_name);
kfree(subvol_name);
}
return 0;
--
2.49.0
Powered by blists - more mailing lists