summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorThomas Weißschuh <linux@weissschuh.net>2023-06-07 19:28:48 +0200
committerChristian Brauner <brauner@kernel.org>2023-06-07 21:49:55 +0200
commit62176420274db5b5127cd7a0083a9aeb461756ee (patch)
tree97bae99e6d636fc907d112fb908d193aa4de9d11 /fs
parent943211c87427f25bd22e0e63849fb486bb5f87fa (diff)
fs: avoid empty option when generating legacy mount string
As each option string fragment is always prepended with a comma it would happen that the whole string always starts with a comma. This could be interpreted by filesystem drivers as an empty option and may produce errors. For example the NTFS driver from ntfs.ko behaves like this and fails when mounted via the new API. Link: https://github.com/util-linux/util-linux/issues/2298 Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> Fixes: 3e1aeb00e6d1 ("vfs: Implement a filesystem superblock creation/configuration context") Cc: stable@vger.kernel.org Message-Id: <20230607-fs-empty-option-v1-1-20c8dbf4671b@weissschuh.net> Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/fs_context.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/fs_context.c b/fs/fs_context.c
index 24ce12f0db32..851214d1d013 100644
--- a/fs/fs_context.c
+++ b/fs/fs_context.c
@@ -561,7 +561,8 @@ static int legacy_parse_param(struct fs_context *fc, struct fs_parameter *param)
return -ENOMEM;
}
- ctx->legacy_data[size++] = ',';
+ if (size)
+ ctx->legacy_data[size++] = ',';
len = strlen(param->key);
memcpy(ctx->legacy_data + size, param->key, len);
size += len;