ovl: fix regression from new mount api conversion
Subsystems (2)
Amir Goldstein
maintainercover ovl: fix regression from new mount api conversion
Miklos, Christian,
I decided this was easy enough to fix with a generic helper without duplicating code, so we'd better fix it while 6.5.y is still taking fixed.
It looks like smb3_fs_context_parse_monolithic() could also use the generic helper, but it is not a straight forward change, so I will leave that to smb client developers.
Thanks,
Amir.
Amir Goldstein (2):
fs: factor out vfs_parse_monolithic_sep() helper
ovl: fix regression in parsing of mount options with esacped comma
fs/fs_context.c | 34 +++++++++++++++++++++++++++++----- fs/overlayfs/params.c | 29 +++++++++++++++++++++++++++++ include/linux/fs_context.h | 2 ++ 3 files changed, 60 insertions(+), 5 deletions(-)
Signature · 1 line
2.34.1
Amir Goldstein
maintainerPATCH 1/2 fs: factor out vfs_parse_monolithic_sep() helper
Factor out vfs_parse_monolithic_sep() from generic_parse_monolithic(), so filesystems could use it with a custom option separator callback.
---
Christian,
If you can ack this patch, I'd rather send it to Linus for 6.6-rc6, along with the two ovl option parsing fixes.
I checked that it does not conflict with any code on vfs.all OTM.
Thanks,
Amir.
fs/fs_context.c | 34 +++++++++++++++++++++++++++++----- include/linux/fs_context.h | 2 ++ 2 files changed, 31 insertions(+), 5 deletions(-)
fs/fs_context.c +29 -5
@@ -192,17 +192,19 @@ int vfs_parse_fs_string(struct fs_context *fc, const char *key,EXPORT_SYMBOL (vfs_parse_fs_string);/** -* generic_parse_monolithic - Parse key[=val][,key[=val]]* mount data +* vfs_parse_monolithic_sep - Parse key[=val][,key[=val]]* mount data * @fc: The superblock configuration to fill in. * @data: The data to parse +* @sep: callback for separating next option * -* Parse a blob of data that's in key[=val][,key[=val]]* form. This can be -* called from the ->monolithic_mount_data() fs_context operation. +* Parse a blob of data that's in key[=val][,key[=val]]* form with a custom +* option separator callback. * * Returns 0 on success or the error returned by the ->parse_option() fs_context * operation on failure. */ -int generic_parse_monolithic (struct fs_context *fc,void *data) +int vfs_parse_monolithic_sep (struct fs_context *fc,void *data, +char *(*sep)(char **)) {char *options = data, *key;int ret =0 ;
@@ -214,7 +216,7 @@ int generic_parse_monolithic(struct fs_context *fc, void *data)if (ret)return ret; -while ((key =strsep (&options,"," )) !=NULL ) { +while ((key =sep (&options)) !=NULL ) {if (*key) {size_t v_len =0 ;char *value =strchr (key,'=' );
@@ -233,6 +235,28 @@ int generic_parse_monolithic(struct fs_context *fc, void *data)return ret; } +EXPORT_SYMBOL (vfs_parse_monolithic_sep); + +static char *vfs_parse_comma_sep (char **s) +{ +return strsep (s,"," ); +} + +/** +* generic_parse_monolithic - Parse key[=val][,key[=val]]* mount data +* @fc: The superblock configuration to fill in. +* @data: The data to parse +* +* Parse a blob of data that's in key[=val][,key[=val]]* form. This can be +* called from the ->monolithic_mount_data() fs_context operation. +* +* Returns 0 on success or the error returned by the ->parse_option() fs_context +* operation on failure. +*/ +int generic_parse_monolithic (struct fs_context *fc,void *data) +{ +return vfs_parse_monolithic_sep (fc, data, vfs_parse_comma_sep); +}EXPORT_SYMBOL (generic_parse_monolithic);/**
include/linux/fs_context.h +2 -0
@@ -136,6 +136,8 @@ extern struct fs_context *vfs_dup_fs_context(struct fs_context *fc);extern int vfs_parse_fs_param (struct fs_context *fc,struct fs_parameter *param);extern int vfs_parse_fs_string (struct fs_context *fc,const char *key,const char *value,size_t v_size); +int vfs_parse_monolithic_sep (struct fs_context *fc,void *data, +char *(*sep)(char **));extern int generic_parse_monolithic (struct fs_context *fc,void *data);extern int vfs_get_tree (struct fs_context *fc);extern void put_fs_context (struct fs_context *fc);
Signature · 1 line
2.34.1
Re: [PATCH 1/2] fs: factor out vfs_parse_monolithic_sep() helper
Quoted 10 lines · Amir Goldstein
Factor out
vfs_parse_monolithic_sep()fromgeneric_parse_monolithic(), so filesystems could use it with a custom option separator callback.Signed-off-by Amir Goldstein <[email protected]>---
Christian,
If you can ack this patch, I'd rather send it to Linus for 6.6-rc6, along with the two ovl option parsing fixes.
Sounds good to me.
Amir Goldstein
maintainerPATCH 2/2 ovl: fix regression in parsing of mount options with esacped comma
In reply to Amir GoldsteinEver since commit 91c77947133f ("ovl: allow filenames with comma"), the following example was legit overlayfs mount options:
mount -t overlay overlay -o 'lowerdir=/tmp/a\,b/lower' /mnt
The conversion to new mount api moved to using the common helper generic_parse_monolithic() and discarded the specialized ovl_next_opt() option separator.
Bring back ovl_next_opt() and use vfs_parse_monolithic_sep() to fix the regression.
--- fs/overlayfs/params.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
fs/overlayfs/params.c +29 -0
@@ -157,6 +157,34 @@ const struct fs_parameter_spec ovl_parameter_spec[] = { {} }; +static char *ovl_next_opt (char **s) +{ +char *sbegin = *s; +char *p; + +if (sbegin ==NULL ) +return NULL ; + +for (p = sbegin; *p; p++) { +if (*p =='\\' ) { + p++; +if (!*p) +break ; + }else if (*p ==',' ) { + *p ='\0' ; + *s = p +1 ; +return sbegin; + } + } + *s =NULL ; +return sbegin; +} + +static int ovl_parse_monolithic (struct fs_context *fc,void *data) +{ +return vfs_parse_monolithic_sep (fc, data, ovl_next_opt); +} +static ssize_t ovl_parse_param_split_lowerdirs (char *str) {ssize_t nr_layers =1 , nr_colons =0 ;
@@ -683,6 +711,7 @@ static int ovl_reconfigure(struct fs_context *fc) }static const struct fs_context_operations ovl_context_ops = { + .parse_monolithic = ovl_parse_monolithic, .parse_param = ovl_parse_param, .get_tree = ovl_get_tree, .reconfigure = ovl_reconfigure,
Signature · 1 line
2.34.1