FAILED: patch "[PATCH] smb: client: fix parsing of source mount option" failed to apply to 6.1-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 49024ec8795ed2bd7217c249ef50a70c4e25d662
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023072059-spinout-subway-2ec1@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
49024ec8795e ("smb: client: fix parsing of source mount option") 38c8a9a52082 ("smb: move client and server files to common directory fs/smb") d5a863a153e9 ("cifs: avoid dup prefix path in dfs_get_automount_devname()") d19342c6609b ("cifs: sanitize paths in cifs_update_super_prepath.") 7e0e76d99079 ("smb3: lower default deferred close timeout to address perf regression") 7ad54b98fc1f ("cifs: use origin fullpath for automounts")a1c0d00572fc ("cifs: share dfs connections and supers")a73a26d97eca ("cifs: split out ses and tcon retrieval from mount_get_conns()") 2301bc103ac4 ("cifs: remove unused smb3_fs_context::mount_options") abdb1742a312 ("cifs: get rid of mount options string parsing") 9fd29a5bae6e ("cifs: use fs_context for automounts")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 49024ec8795ed2bd7217c249ef50a70c4e25d662 Mon Sep 17 00:00:00 2001
From: Paulo Alcantara <[email protected]>
Date: Tue, 27 Jun 2023 21:24:47 -0300
Subject: [PATCH] smb: client: fix parsing of source mount option
Handle trailing and leading separators when parsing UNC and prefix paths in smb3_parse_devname(). Then, store the sanitised paths in smb3_fs_context::source.
This fixes the following cases
$ mount //srv/share// /mnt/1 -o ... $ cat /mnt/1/d0/f0 cat: /mnt/1/d0/f0: Invalid argument
The -EINVAL was returned because the client sent SMB2_CREATE "\\d0\f0" rather than SMB2_CREATE "\d0\f0".
$ mount //srv//share /mnt/1 -o ... mount: Invalid argument
The -EINVAL was returned correctly although the client only realised it after sending a couple of bad requests rather than bailing out earlier when parsing mount options.
fs/smb/client/cifs_dfs_ref.c +14 -6
@@ -118,12 +118,12 @@ cifs_build_devname(char *nodename, const char *prepath)return dev; } -static int set_dest_addr (struct smb3_fs_context *ctx,const char *full_path) +static int set_dest_addr (struct smb3_fs_context *ctx) {struct sockaddr *addr = (struct sockaddr *)&ctx->dstaddr;int rc; - rc =dns_resolve_server_name_to_ip (full_path, addr,NULL ); + rc =dns_resolve_server_name_to_ip (ctx->source, addr,NULL );if (!rc)cifs_set_port (addr, ctx->port);return rc;
@@ -171,10 +171,9 @@ static struct vfsmount *cifs_dfs_do_automount(struct path *path) mnt =ERR_CAST (full_path); goto out; } -cifs_dbg (FYI ,"%s: full_path: %s\n" , __func__, full_path); tmp = *cur_ctx; - tmp.source = full_path; + tmp.source =NULL ; tmp.leaf_fullpath =NULL ; tmp.UNC = tmp.prepath =NULL ; tmp.dfs_root_ses =NULL ;
@@ -185,13 +184,22 @@ static struct vfsmount *cifs_dfs_do_automount(struct path *path) goto out; } - rc =set_dest_addr (ctx, full_path); + rc =smb3_parse_devname (full_path, ctx);if (rc) { mnt =ERR_PTR (rc); goto out; } - rc =smb3_parse_devname (full_path, ctx); + ctx->source =smb3_fs_context_fullpath (ctx,'/' ); +if (IS_ERR (ctx->source)) { + mnt =ERR_CAST (ctx->source); + ctx->source =NULL ; + goto out; + } +cifs_dbg (FYI ,"%s: ctx: source=%s UNC=%s prepath=%s dstaddr=%pISpc\n" , + __func__, ctx->source, ctx->UNC, ctx->prepath, &ctx->dstaddr); + + rc =set_dest_addr (ctx);if (!rc) mnt =fc_mount (fc);else
fs/smb/client/cifsproto.h +2 -0
@@ -85,6 +85,8 @@ extern void release_mid(struct mid_q_entry *mid);extern void cifs_wake_up_task (struct mid_q_entry *mid);extern int cifs_handle_standard (struct TCP_Server_Info *server,struct mid_q_entry *mid); +extern char *smb3_fs_context_fullpath (const struct smb3_fs_context *ctx, +char dirsep);extern int smb3_parse_devname (const char *devname,struct smb3_fs_context *ctx);extern int smb3_parse_opt (const char *options,const char *key,char **val);extern int cifs_ipaddr_cmp (struct sockaddr *srcaddr,struct sockaddr *rhs);
fs/smb/client/dfs.c +3 -35
@@ -54,39 +54,6 @@ int dfs_parse_target_referral(const char *full_path, const struct dfs_info3_parareturn rc; } -/* -* cifs_build_path_to_root returns full path to root when we do not have an -* existing connection (tcon) -*/ -static char *build_unc_path_to_root (const struct smb3_fs_context *ctx, -const struct cifs_sb_info *cifs_sb,bool useppath) -{ -char *full_path, *pos; -unsigned int pplen = useppath && ctx->prepath ?strlen (ctx->prepath) +1 :0 ; -unsigned int unc_len =strnlen (ctx->UNC,MAX_TREE_SIZE +1 ); - -if (unc_len >MAX_TREE_SIZE ) -return ERR_PTR (-EINVAL ); - - full_path =kmalloc (unc_len + pplen +1 ,GFP_KERNEL ); -if (full_path ==NULL ) -return ERR_PTR (-ENOMEM ); - -memcpy (full_path, ctx->UNC, unc_len); - pos = full_path + unc_len; - -if (pplen) { - *pos =CIFS_DIR_SEP (cifs_sb); -memcpy (pos +1 , ctx->prepath, pplen); - pos += pplen; - } - - *pos ='\0' ;/* add trailing null */ -convert_delimiter (full_path,CIFS_DIR_SEP (cifs_sb)); -cifs_dbg (FYI ,"%s: full_path=%s\n" , __func__, full_path); -return full_path; -} -static int get_session (struct cifs_mount_ctx *mnt_ctx,const char *full_path) {struct smb3_fs_context *ctx = mnt_ctx->fs_ctx;
@@ -179,6 +146,7 @@ static int __dfs_mount_share(struct cifs_mount_ctx *mnt_ctx)struct TCP_Server_Info *server;struct cifs_tcon *tcon;char *origin_fullpath =NULL ; +char sep =CIFS_DIR_SEP (cifs_sb);int num_links =0 ;int rc;
@@ -186,7 +154,7 @@ static int __dfs_mount_share(struct cifs_mount_ctx *mnt_ctx)if (IS_ERR (ref_path))return PTR_ERR (ref_path); - full_path =build_unc_path_to_root (ctx, cifs_sb, true); + full_path =smb3_fs_context_fullpath (ctx, sep);if (IS_ERR (full_path)) { rc =PTR_ERR (full_path); full_path =NULL ;
@@ -228,7 +196,7 @@ static int __dfs_mount_share(struct cifs_mount_ctx *mnt_ctx)kfree (full_path); ref_path = full_path =NULL ; - full_path =build_unc_path_to_root (ctx, cifs_sb, true); + full_path =smb3_fs_context_fullpath (ctx, sep);if (IS_ERR (full_path)) { rc =PTR_ERR (full_path); full_path =NULL ;
fs/smb/client/fs_context.c +50 -9
104 lines not on this page · raw message
fs/smb/client/misc.c +11 -6
@@ -1198,16 +1198,21 @@ int match_target_ip(struct TCP_Server_Info *server,int cifs_update_super_prepath (struct cifs_sb_info *cifs_sb,char *prefix) { +int rc; +kfree (cifs_sb->prepath); + cifs_sb->prepath =NULL ;if (prefix && *prefix) { cifs_sb->prepath =cifs_sanitize_prepath (prefix,GFP_ATOMIC ); -if (!cifs_sb->prepath) -return -ENOMEM ; - -convert_delimiter (cifs_sb->prepath,CIFS_DIR_SEP (cifs_sb)); - }else - cifs_sb->prepath =NULL ; +if (IS_ERR (cifs_sb->prepath)) { + rc =PTR_ERR (cifs_sb->prepath); + cifs_sb->prepath =NULL ; +return rc; + } +if (cifs_sb->prepath) +convert_delimiter (cifs_sb->prepath,CIFS_DIR_SEP (cifs_sb)); + } cifs_sb->mnt_cifs_flags |=CIFS_MOUNT_USE_PREFIX_PATH ;return 0 ;