smb: client: fix parsing of source mount option
Subsystems (3)
PATCH 1/4 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 | 28 +++++++++++------ fs/smb/client/cifsproto.h | 2 ++ fs/smb/client/dfs.c | 38 ++--------------------- fs/smb/client/fs_context.c | 59 ++++++++++++++++++++++++++++++------ fs/smb/client/misc.c | 17 +++++++---- 5 files changed, 84 insertions(+), 60 deletions(-)
fs/smb/client/cifs_dfs_ref.c +18 -10
@@ -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); -if (rc) { - mnt =ERR_PTR (rc); - goto out; - } - rc =smb3_parse_devname (full_path, ctx); +if (rc) { + mnt =ERR_PTR (rc); + goto out; + } + + 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 ;
Signature · 1 line
2.41.0
PATCH 2/4 smb: client: fix shared DFS root mounts with different prefixes
When having two DFS root mounts that are connected to same namespace, same mount options but different prefix paths, we can't really use the shared @server->origin_fullpath when chasing DFS links in them.
Move the origin_fullpath field to cifs_tcon structure so when having shared DFS root mounts with different prefix paths, and we need to chase any DFS links, dfs_get_automount_devname() will pick up the correct full path out of the @tcon that will be used for the new mount.
Before patch
mount.cifs //dom/dfs/dir /mnt/1 -o ...
mount.cifs //dom/dfs /mnt/2 -o ...
# shared server, ses, tcon # server: origin_fullpath=//dom/dfs/dir
# @server->origin_fullpath + '/dir/link1'
$ ls /mnt/2/dir/link1 ls: cannot open directory '/mnt/2/dir/link1': No such file or directory
After patch
mount.cifs //dom/dfs/dir /mnt/1 -o ...
mount.cifs //dom/dfs /mnt/2 -o ...
# shared server & ses # tcon_1: origin_fullpath=//dom/dfs/dir # tcon_2: origin_fullpath=//dom/dfs
# @tcon_2->origin_fullpath + '/dir/link1'
$ ls /mnt/2/dir/link1 dir0 dir1 dir10 dir3 dir5 dir6 dir7 dir9 target2_file.txt tsub
--- fs/smb/client/cifs_debug.c | 16 +++++---- fs/smb/client/cifsglob.h | 10 +++--- fs/smb/client/cifsproto.h | 2 +- fs/smb/client/connect.c | 70 ++++++++++++++++++++++---------------- fs/smb/client/dfs.c | 30 +++++----------- fs/smb/client/dfs.h | 19 +++++------ fs/smb/client/dfs_cache.c | 8 +++-- fs/smb/client/misc.c | 37 +++++++++++++++----- 8 files changed, 105 insertions(+), 87 deletions(-)
fs/smb/client/cifs_debug.c +9 -7
@@ -123,6 +123,12 @@ static void cifs_debug_tcon(struct seq_file *m, struct cifs_tcon *tcon)seq_puts (m," nosparse" );if (tcon->need_reconnect)seq_puts (m,"\tDISCONNECTED " ); +spin_lock (&tcon->tc_lock); +if (tcon->origin_fullpath) { +seq_printf (m,"\n\tDFS origin fullpath: %s" , + tcon->origin_fullpath); + } +spin_unlock (&tcon->tc_lock);seq_putc (m,'\n' ); }
@@ -465,13 +471,9 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)seq_printf (m,"\nIn Send: %d In MaxReq Wait: %d" ,atomic_read (&server->in_send),atomic_read (&server->num_waiters)); -if (IS_ENABLED (CONFIG_CIFS_DFS_UPCALL )) { -if (server->origin_fullpath) -seq_printf (m,"\nDFS origin full path: %s" , - server->origin_fullpath); -if (server->leaf_fullpath) -seq_printf (m,"\nDFS leaf full path: %s" , - server->leaf_fullpath); +if (server->leaf_fullpath) { +seq_printf (m,"\nDFS leaf full path: %s" , + server->leaf_fullpath); }seq_printf (m,"\n\n\tSessions: " );
fs/smb/client/cifsglob.h +4 -6
@@ -736,23 +736,20 @@ struct TCP_Server_Info {#endif struct mutex refpath_lock;/* protects leaf_fullpath */ /* -* origin_fullpath: Canonical copy of smb3_fs_context::source. -* It is used for matching existing DFS tcons. -* * leaf_fullpath: Canonical DFS referral path related to this * connection. * It is used in DFS cache refresher, reconnect and may * change due to nested DFS links. * -* Both protected by @refpath_lock and @srv_lock. The @refpath_lock is -* mosly used for not requiring a copy of @leaf_fullpath when getting +* Protected by @refpath_lock and @srv_lock. The @refpath_lock is +* mostly used for not requiring a copy of @leaf_fullpath when getting * cached or new DFS referrals (which might also sleep during I/O). * While @srv_lock is held for making string and NULL comparions against * both fields as in mount(2) and cache refresh. * * format: \\HOST\SHARE[\OPTIONAL PATH] */ -char *origin_fullpath, *leaf_fullpath; +char *leaf_fullpath; };static inline bool is_smb1 (struct TCP_Server_Info *server)
@@ -1206,6 +1203,7 @@ struct cifs_tcon {struct delayed_work dfs_cache_work;#endif struct delayed_work query_interfaces;/* query interfaces workqueue job */ +char *origin_fullpath;/* canonical copy of smb3_fs_context::source */ };/*
fs/smb/client/cifsproto.h +1 -1
@@ -652,7 +652,7 @@ int smb2_parse_query_directory(struct cifs_tcon *tcon, struct kvec *rsp_iov,int resp_buftype, struct cifs_search_info *srch_inf); -struct super_block *cifs_get_tcp_super (struct TCP_Server_Info *server); +struct super_block *cifs_get_tcon_super (struct cifs_tcon *tcon);void cifs_put_tcp_super (struct super_block *sb);int cifs_update_super_prepath (struct cifs_sb_info *cifs_sb,char *prefix);char *extract_hostname (const char *unc);
fs/smb/client/connect.c +40 -30
132 lines not on this page · raw message
fs/smb/client/dfs.c +9 -21
@@ -217,14 +217,12 @@ static int __dfs_mount_share(struct cifs_mount_ctx *mnt_ctx) server = mnt_ctx->server; tcon = mnt_ctx->tcon; -mutex_lock (&server->refpath_lock); -spin_lock (&server->srv_lock); -if (!server->origin_fullpath) { - server->origin_fullpath = origin_fullpath; +spin_lock (&tcon->tc_lock); +if (!tcon->origin_fullpath) { + tcon->origin_fullpath = origin_fullpath; origin_fullpath =NULL ; } -spin_unlock (&server->srv_lock); -mutex_unlock (&server->refpath_lock); +spin_unlock (&tcon->tc_lock);if (list_empty (&tcon->dfs_ses_list)) { list_replace_init(&mnt_ctx->dfs_ses_list,
@@ -247,18 +245,13 @@ int dfs_mount_share(struct cifs_mount_ctx *mnt_ctx, bool *isdfs) {struct smb3_fs_context *ctx = mnt_ctx->fs_ctx;struct cifs_ses *ses; -char *source = ctx->source;bool nodfs = ctx->nodfs;int rc; *isdfs = false; -/* Temporarily set @ctx->source to NULL as we're not matching DFS -* superblocks yet. See cifs_match_super() and match_server(). -*/ - ctx->source =NULL ; rc =get_session (mnt_ctx,NULL );if (rc) - goto out; +return rc; ctx->dfs_root_ses = mnt_ctx->ses;/*
@@ -272,7 +265,7 @@ int dfs_mount_share(struct cifs_mount_ctx *mnt_ctx, bool *isdfs) rc =dfs_get_referral (mnt_ctx, ctx->UNC +1 ,NULL ,NULL );if (rc) {if (rc != -ENOENT && rc != -EOPNOTSUPP && rc != -EIO ) - goto out; +return rc; nodfs = true; } }
@@ -280,7 +273,7 @@ int dfs_mount_share(struct cifs_mount_ctx *mnt_ctx, bool *isdfs) rc =cifs_mount_get_tcon (mnt_ctx);if (!rc) rc =cifs_is_path_remote (mnt_ctx); - goto out; +return rc; } *isdfs = true;
@@ -296,12 +289,7 @@ int dfs_mount_share(struct cifs_mount_ctx *mnt_ctx, bool *isdfs) rc =__dfs_mount_share (mnt_ctx);if (ses == ctx->dfs_root_ses)cifs_put_smb_ses (ses); -out: -/* -* Restore previous value of @ctx->source so DFS superblock can be -* matched in cifs_match_super(). -*/ - ctx->source = source; +return rc; }
@@ -571,7 +559,7 @@ int cifs_tree_connect(const unsigned int xid, struct cifs_tcon *tcon, const stru goto out; } - sb =cifs_get_tcp_super (server); + sb =cifs_get_tcon_super (tcon);if (IS_ERR (sb)) { rc =PTR_ERR (sb);cifs_dbg (VFS ,"%s: could not find superblock: %d\n" , __func__, rc);
fs/smb/client/dfs.h +9 -10
@@ -39,16 +39,15 @@ static inline char *dfs_get_automount_devname(struct dentry *dentry, void *page) {struct cifs_sb_info *cifs_sb =CIFS_SB (dentry->d_sb);struct cifs_tcon *tcon =cifs_sb_master_tcon (cifs_sb); -struct TCP_Server_Info *server = tcon->ses->server;size_t len;char *s; -spin_lock (&server->srv_lock); -if (unlikely (!server->origin_fullpath)) { -spin_unlock (&server->srv_lock); +spin_lock (&tcon->tc_lock); +if (unlikely (!tcon->origin_fullpath)) { +spin_unlock (&tcon->tc_lock);return ERR_PTR (-EREMOTE ); } -spin_unlock (&server->srv_lock); +spin_unlock (&tcon->tc_lock); s =dentry_path_raw (dentry, page,PATH_MAX );if (IS_ERR (s))
@@ -57,16 +56,16 @@ static inline char *dfs_get_automount_devname(struct dentry *dentry, void *page)if (!s[1 ]) s++; -spin_lock (&server->srv_lock); - len =strlen (server->origin_fullpath); +spin_lock (&tcon->tc_lock); + len =strlen (tcon->origin_fullpath);if (s < (char *)page + len) { -spin_unlock (&server->srv_lock); +spin_unlock (&tcon->tc_lock);return ERR_PTR (-ENAMETOOLONG ); } s -= len; -memcpy (s, server->origin_fullpath, len); -spin_unlock (&server->srv_lock); +memcpy (s, tcon->origin_fullpath, len); +spin_unlock (&tcon->tc_lock);convert_delimiter (s,'/' );return s;
fs/smb/client/dfs_cache.c +5 -3
@@ -1248,18 +1248,20 @@ static int refresh_tcon(struct cifs_tcon *tcon, bool force_refresh)int dfs_cache_remount_fs (struct cifs_sb_info *cifs_sb) {struct cifs_tcon *tcon; -struct TCP_Server_Info *server;if (!cifs_sb || !cifs_sb->master_tlink)return -EINVAL ; tcon =cifs_sb_master_tcon (cifs_sb); - server = tcon->ses->server; -if (!server->origin_fullpath) { +spin_lock (&tcon->tc_lock); +if (!tcon->origin_fullpath) { +spin_unlock (&tcon->tc_lock);cifs_dbg (FYI ,"%s: not a dfs mount\n" , __func__);return 0 ; } +spin_unlock (&tcon->tc_lock); +/* * After reconnecting to a different server, unique ids won't match anymore, so we disable * serverino. This prevents dentry revalidation to think the dentry are stale (ESTALE).
fs/smb/client/misc.c +28 -9
@@ -156,6 +156,7 @@ tconInfoFree(struct cifs_tcon *tcon)#ifdef CONFIG_CIFS_DFS_UPCALL dfs_put_root_smb_sessions (&tcon->dfs_ses_list);#endif +kfree (tcon->origin_fullpath);kfree (tcon); }
@@ -1106,20 +1107,25 @@ struct super_cb_data {struct super_block *sb; }; -static void tcp_super_cb (struct super_block *sb,void *arg) +static void tcon_super_cb (struct super_block *sb,void *arg) {struct super_cb_data *sd = arg; -struct TCP_Server_Info *server = sd->data;struct cifs_sb_info *cifs_sb; -struct cifs_tcon *tcon; +struct cifs_tcon *t1 = sd->data, *t2;if (sd->sb)return ; cifs_sb =CIFS_SB (sb); - tcon =cifs_sb_master_tcon (cifs_sb); -if (tcon->ses->server == server) + t2 =cifs_sb_master_tcon (cifs_sb); + +spin_lock (&t2->tc_lock); +if (t1->ses == t2->ses && + t1->ses->server == t2->ses->server && + t2->origin_fullpath && +dfs_src_pathname_equal (t2->origin_fullpath, t1->origin_fullpath)) sd->sb = sb; +spin_unlock (&t2->tc_lock); } static struct super_block *__cifs_get_super(void (*f)(struct super_block *, void *),
@@ -1154,9 +1160,15 @@ static void __cifs_put_super(struct super_block *sb)cifs_sb_deactive (sb); } -struct super_block *cifs_get_tcp_super (struct TCP_Server_Info *server) +struct super_block *cifs_get_tcon_super (struct cifs_tcon *tcon) { -return __cifs_get_super (tcp_super_cb, server); +spin_lock (&tcon->tc_lock); +if (unlikely (!tcon->origin_fullpath)) { +spin_unlock (&tcon->tc_lock); +return ERR_PTR (-ENOENT ); + } +spin_unlock (&tcon->tc_lock); +return __cifs_get_super (tcon_super_cb, tcon); }void cifs_put_tcp_super (struct super_block *sb)
@@ -1243,9 +1255,16 @@ int cifs_inval_name_dfs_link_error(const unsigned int xid,*/ if (strlen (full_path) <2 || !cifs_sb || (cifs_sb->mnt_cifs_flags &CIFS_MOUNT_NO_DFS ) || - !is_tcon_dfs (tcon) || !ses->server->origin_fullpath) + !is_tcon_dfs (tcon))return 0 ; +spin_lock (&tcon->tc_lock); +if (!tcon->origin_fullpath) { +spin_unlock (&tcon->tc_lock); +return 0 ; + } +spin_unlock (&tcon->tc_lock); +/* * Slow path - tcon is DFS and @full_path has prefix path, so attempt * to get a referral to figure out whether it is an DFS link.
@@ -1269,7 +1288,7 @@ int cifs_inval_name_dfs_link_error(const unsigned int xid,/* * XXX: we are not using dfs_cache_find() here because we might -* end filling all the DFS cache and thus potentially +* end up filling all the DFS cache and thus potentially * removing cached DFS targets that the client would eventually * need during failover. */
Signature · 1 line
2.41.0
Re: [PATCH 2/4] smb: client: fix shared DFS root mounts with different prefixes
Hi Steve,
Sorry, but I've missed an important change in cifs_tree_connect(). If we couldn't find DFS superlock from @tcon, it means that we must still go on and tree connect to last share set in @tcon->tree_name. Otherwise, we'd leave the non-DFS tcon disconnected as long as the mount is active.
I also took the opportunity for renaming cifs_get_tcon_super() to cifs_get_dfs_tcon_super() to make it more clearer.
Find the updated patch as attachment.
From e1f3dfc6769189f03117130b4fe01990a51aa5da Mon Sep 17 00:00:00 2001
From: Paulo Alcantara <[email protected]>
Date: Mon, 26 Jun 2023 16:04:17 -0300
Subject: [PATCH] smb: client: fix shared DFS root mounts with different
prefixes
When having two DFS root mounts that are connected to same namespace, same mount options but different prefix paths, we can't really use the shared @server->origin_fullpath when chasing DFS links in them.
Move the origin_fullpath field to cifs_tcon structure so when having shared DFS root mounts with different prefix paths, and we need to chase any DFS links, dfs_get_automount_devname() will pick up the correct full path out of the @tcon that will be used for the new mount.
Before patch
mount.cifs //dom/dfs/dir /mnt/1 -o ...
mount.cifs //dom/dfs /mnt/2 -o ...
# shared server, ses, tcon # server: origin_fullpath=//dom/dfs/dir
# @server->origin_fullpath + '/dir/link1'
$ ls /mnt/2/dir/link1 ls: cannot open directory '/mnt/2/dir/link1': No such file or directory
After patch
mount.cifs //dom/dfs/dir /mnt/1 -o ...
mount.cifs //dom/dfs /mnt/2 -o ...
# shared server & ses # tcon_1: origin_fullpath=//dom/dfs/dir # tcon_2: origin_fullpath=//dom/dfs
# @tcon_2->origin_fullpath + '/dir/link1'
$ ls /mnt/2/dir/link1 dir0 dir1 dir10 dir3 dir5 dir6 dir7 dir9 target2_file.txt tsub
--- fs/smb/client/cifs_debug.c | 16 +++++---- fs/smb/client/cifsglob.h | 10 +++--- fs/smb/client/cifsproto.h | 2 +- fs/smb/client/connect.c | 70 ++++++++++++++++++++++---------------- fs/smb/client/dfs.c | 55 ++++++++++++------------------ fs/smb/client/dfs.h | 19 +++++------ fs/smb/client/dfs_cache.c | 8 +++-- fs/smb/client/misc.c | 38 ++++++++++++++++----- 8 files changed, 118 insertions(+), 100 deletions(-)
fs/smb/client/cifs_debug.c +9 -7
@@ -123,6 +123,12 @@ static void cifs_debug_tcon(struct seq_file *m, struct cifs_tcon *tcon)seq_puts (m," nosparse" );if (tcon->need_reconnect)seq_puts (m,"\tDISCONNECTED " ); +spin_lock (&tcon->tc_lock); +if (tcon->origin_fullpath) { +seq_printf (m,"\n\tDFS origin fullpath: %s" , + tcon->origin_fullpath); + } +spin_unlock (&tcon->tc_lock);seq_putc (m,'\n' ); }
@@ -465,13 +471,9 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)seq_printf (m,"\nIn Send: %d In MaxReq Wait: %d" ,atomic_read (&server->in_send),atomic_read (&server->num_waiters)); -if (IS_ENABLED (CONFIG_CIFS_DFS_UPCALL )) { -if (server->origin_fullpath) -seq_printf (m,"\nDFS origin full path: %s" , - server->origin_fullpath); -if (server->leaf_fullpath) -seq_printf (m,"\nDFS leaf full path: %s" , - server->leaf_fullpath); +if (server->leaf_fullpath) { +seq_printf (m,"\nDFS leaf full path: %s" , + server->leaf_fullpath); }seq_printf (m,"\n\n\tSessions: " );
fs/smb/client/cifsglob.h +4 -6
@@ -736,23 +736,20 @@ struct TCP_Server_Info {#endif struct mutex refpath_lock;/* protects leaf_fullpath */ /* -* origin_fullpath: Canonical copy of smb3_fs_context::source. -* It is used for matching existing DFS tcons. -* * leaf_fullpath: Canonical DFS referral path related to this * connection. * It is used in DFS cache refresher, reconnect and may * change due to nested DFS links. * -* Both protected by @refpath_lock and @srv_lock. The @refpath_lock is -* mosly used for not requiring a copy of @leaf_fullpath when getting +* Protected by @refpath_lock and @srv_lock. The @refpath_lock is +* mostly used for not requiring a copy of @leaf_fullpath when getting * cached or new DFS referrals (which might also sleep during I/O). * While @srv_lock is held for making string and NULL comparions against * both fields as in mount(2) and cache refresh. * * format: \\HOST\SHARE[\OPTIONAL PATH] */ -char *origin_fullpath, *leaf_fullpath; +char *leaf_fullpath; };static inline bool is_smb1 (struct TCP_Server_Info *server)
@@ -1206,6 +1203,7 @@ struct cifs_tcon {struct delayed_work dfs_cache_work;#endif struct delayed_work query_interfaces;/* query interfaces workqueue job */ +char *origin_fullpath;/* canonical copy of smb3_fs_context::source */ };/*
fs/smb/client/cifsproto.h +1 -1
@@ -652,7 +652,7 @@ int smb2_parse_query_directory(struct cifs_tcon *tcon, struct kvec *rsp_iov,int resp_buftype, struct cifs_search_info *srch_inf); -struct super_block *cifs_get_tcp_super (struct TCP_Server_Info *server); +struct super_block *cifs_get_dfs_tcon_super (struct cifs_tcon *tcon);void cifs_put_tcp_super (struct super_block *sb);int cifs_update_super_prepath (struct cifs_sb_info *cifs_sb,char *prefix);char *extract_hostname (const char *unc);
fs/smb/client/connect.c +40 -30
132 lines not on this page · raw message
fs/smb/client/dfs.c +21 -34
109 lines not on this page · raw message
fs/smb/client/dfs.h +9 -10
@@ -39,16 +39,15 @@ static inline char *dfs_get_automount_devname(struct dentry *dentry, void *page) {struct cifs_sb_info *cifs_sb =CIFS_SB (dentry->d_sb);struct cifs_tcon *tcon =cifs_sb_master_tcon (cifs_sb); -struct TCP_Server_Info *server = tcon->ses->server;size_t len;char *s; -spin_lock (&server->srv_lock); -if (unlikely (!server->origin_fullpath)) { -spin_unlock (&server->srv_lock); +spin_lock (&tcon->tc_lock); +if (unlikely (!tcon->origin_fullpath)) { +spin_unlock (&tcon->tc_lock);return ERR_PTR (-EREMOTE ); } -spin_unlock (&server->srv_lock); +spin_unlock (&tcon->tc_lock); s =dentry_path_raw (dentry, page,PATH_MAX );if (IS_ERR (s))
@@ -57,16 +56,16 @@ static inline char *dfs_get_automount_devname(struct dentry *dentry, void *page)if (!s[1 ]) s++; -spin_lock (&server->srv_lock); - len =strlen (server->origin_fullpath); +spin_lock (&tcon->tc_lock); + len =strlen (tcon->origin_fullpath);if (s < (char *)page + len) { -spin_unlock (&server->srv_lock); +spin_unlock (&tcon->tc_lock);return ERR_PTR (-ENAMETOOLONG ); } s -= len; -memcpy (s, server->origin_fullpath, len); -spin_unlock (&server->srv_lock); +memcpy (s, tcon->origin_fullpath, len); +spin_unlock (&tcon->tc_lock);convert_delimiter (s,'/' );return s;
fs/smb/client/dfs_cache.c +5 -3
@@ -1248,18 +1248,20 @@ static int refresh_tcon(struct cifs_tcon *tcon, bool force_refresh)int dfs_cache_remount_fs (struct cifs_sb_info *cifs_sb) {struct cifs_tcon *tcon; -struct TCP_Server_Info *server;if (!cifs_sb || !cifs_sb->master_tlink)return -EINVAL ; tcon =cifs_sb_master_tcon (cifs_sb); - server = tcon->ses->server; -if (!server->origin_fullpath) { +spin_lock (&tcon->tc_lock); +if (!tcon->origin_fullpath) { +spin_unlock (&tcon->tc_lock);cifs_dbg (FYI ,"%s: not a dfs mount\n" , __func__);return 0 ; } +spin_unlock (&tcon->tc_lock); +/* * After reconnecting to a different server, unique ids won't match anymore, so we disable * serverino. This prevents dentry revalidation to think the dentry are stale (ESTALE).
fs/smb/client/misc.c +29 -9
@@ -156,6 +156,7 @@ tconInfoFree(struct cifs_tcon *tcon)#ifdef CONFIG_CIFS_DFS_UPCALL dfs_put_root_smb_sessions (&tcon->dfs_ses_list);#endif +kfree (tcon->origin_fullpath);kfree (tcon); }
@@ -1106,20 +1107,25 @@ struct super_cb_data {struct super_block *sb; }; -static void tcp_super_cb (struct super_block *sb,void *arg) +static void tcon_super_cb (struct super_block *sb,void *arg) {struct super_cb_data *sd = arg; -struct TCP_Server_Info *server = sd->data;struct cifs_sb_info *cifs_sb; -struct cifs_tcon *tcon; +struct cifs_tcon *t1 = sd->data, *t2;if (sd->sb)return ; cifs_sb =CIFS_SB (sb); - tcon =cifs_sb_master_tcon (cifs_sb); -if (tcon->ses->server == server) + t2 =cifs_sb_master_tcon (cifs_sb); + +spin_lock (&t2->tc_lock); +if (t1->ses == t2->ses && + t1->ses->server == t2->ses->server && + t2->origin_fullpath && +dfs_src_pathname_equal (t2->origin_fullpath, t1->origin_fullpath)) sd->sb = sb; +spin_unlock (&t2->tc_lock); } static struct super_block *__cifs_get_super(void (*f)(struct super_block *, void *),
@@ -1145,6 +1151,7 @@ static struct super_block *__cifs_get_super(void (*f)(struct super_block *, voidreturn sd.sb; } } +pr_warn_once ("%s: could not find dfs superblock\n" , __func__);return ERR_PTR (-EINVAL ); }
@@ -1154,9 +1161,15 @@ static void __cifs_put_super(struct super_block *sb)cifs_sb_deactive (sb); } -struct super_block *cifs_get_tcp_super (struct TCP_Server_Info *server) +struct super_block *cifs_get_dfs_tcon_super (struct cifs_tcon *tcon) { -return __cifs_get_super (tcp_super_cb, server); +spin_lock (&tcon->tc_lock); +if (!tcon->origin_fullpath) { +spin_unlock (&tcon->tc_lock); +return ERR_PTR (-ENOENT ); + } +spin_unlock (&tcon->tc_lock); +return __cifs_get_super (tcon_super_cb, tcon); }void cifs_put_tcp_super (struct super_block *sb)
@@ -1243,9 +1256,16 @@ int cifs_inval_name_dfs_link_error(const unsigned int xid,*/ if (strlen (full_path) <2 || !cifs_sb || (cifs_sb->mnt_cifs_flags &CIFS_MOUNT_NO_DFS ) || - !is_tcon_dfs (tcon) || !ses->server->origin_fullpath) + !is_tcon_dfs (tcon))return 0 ; +spin_lock (&tcon->tc_lock); +if (!tcon->origin_fullpath) { +spin_unlock (&tcon->tc_lock); +return 0 ; + } +spin_unlock (&tcon->tc_lock); +/* * Slow path - tcon is DFS and @full_path has prefix path, so attempt * to get a referral to figure out whether it is an DFS link.
@@ -1269,7 +1289,7 @@ int cifs_inval_name_dfs_link_error(const unsigned int xid,/* * XXX: we are not using dfs_cache_find() here because we might -* end filling all the DFS cache and thus potentially +* end up filling all the DFS cache and thus potentially * removing cached DFS targets that the client would eventually * need during failover. */
Signature · 1 line
2.41.0
Thanks.
Re: [PATCH 2/4] smb: client: fix shared DFS root mounts with different prefixes
tentatively merged into cifs-2.6.git for-next pending more testing/review
Quoted 15 lines · Paulo Alcantara
Hi Steve,
Sorry, but I've missed an important change in
cifs_tree_connect(). If we couldn't find DFS superlock from @tcon, it means that we must still go on and tree connect to last share set in @tcon->tree_name. Otherwise, we'd leave the non-DFS tcon disconnected as long as the mount is active.I also took the opportunity for renaming
cifs_get_tcon_super()tocifs_get_dfs_tcon_super()to make it more clearer.Find the updated patch as attachment.
Thanks.
Signature · 3 lines
Thanks, Steve
PATCH 3/4 smb: client: fix broken file attrs with nodfs mounts
In reply to Paulo Alcantara*_get_inode_info() functions expect -EREMOTE when query path info calls find a DFS link, regardless whether !CONFIG_CIFS_DFS_UPCALL or 'nodfs' mount option. Otherwise, those files will miss the fake DFS file attributes.
Before patch
$ mount.cifs //srv/dfs /mnt/1 -o ...,nodfs $ ls -l /mnt/1 ls: cannot access '/mnt/1/link': Operation not supported total 0 -rwxr-xr-x 1 root root 0 Jul 26 2022 dfstest2_file1.txt drwxr-xr-x 2 root root 0 Aug 8 2022 dir1 d????????? ? ? ? ? ? link
After patch
$ mount.cifs //srv/dfs /mnt/1 -o ...,nodfs $ ls -l /mnt/1 total 0 -rwxr-xr-x 1 root root 0 Jul 26 2022 dfstest2_file1.txt drwxr-xr-x 2 root root 0 Aug 8 2022 dir1 drwx--x--x 2 root root 0 Jun 26 20:29 link
--- fs/smb/client/smb2inode.c | 3 --- 1 file changed, 3 deletions(-)
fs/smb/client/smb2inode.c +0 -3
@@ -609,9 +609,6 @@ int smb2_query_path_info(const unsigned int xid, struct cifs_tcon *tcon,if (islink) rc = -EREMOTE ; } -if (rc == -EREMOTE &&IS_ENABLED (CONFIG_CIFS_DFS_UPCALL ) && cifs_sb && - (cifs_sb->mnt_cifs_flags &CIFS_MOUNT_NO_DFS )) - rc = -EOPNOTSUPP ; } out:
Signature · 1 line
2.41.0
PATCH 4/4 smb: client: improve DFS mount check
In reply to Paulo AlcantaraSome servers may return error codes from REQ_GET_DFS_REFERRAL requests that are unexpected by the client, so to make it easier, assume non-DFS mounts when the client can't get the initial DFS referral of @ctx->UNC in dfs_mount_share().
--- fs/smb/client/dfs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/smb/client/dfs.c +3 -2
@@ -264,8 +264,9 @@ int dfs_mount_share(struct cifs_mount_ctx *mnt_ctx, bool *isdfs)if (!nodfs) { rc =dfs_get_referral (mnt_ctx, ctx->UNC +1 ,NULL ,NULL );if (rc) { -if (rc != -ENOENT && rc != -EOPNOTSUPP && rc != -EIO ) -return rc; +cifs_dbg (FYI ,"%s: no dfs referral for %s: %d\n" , + __func__, ctx->UNC +1 , rc); +cifs_dbg (FYI ,"%s: assuming non-dfs mount...\n" , __func__); nodfs = true; } }
Signature · 1 line
2.41.0
Re: [PATCH 4/4] smb: client: improve DFS mount check
tentatively merged all 4 into cifs-2.6.git for-next pending additional review and testing
Quoted 30 lines · Paulo Alcantara
Some servers may return error codes from
REQ_GET_DFS_REFERRALrequests that are unexpected by the client, so to make it easier, assume non-DFS mounts when the client can't get the initial DFS referral of @ctx->UNC indfs_mount_share().Signed-off-by Paulo Alcantara (SUSE) <[email protected]>--- fs/smb/client/dfs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)fs/smb/client/dfs.c +3
-3@@ -264,8 +264,9 @@ int dfs_mount_share(struct cifs_mount_ctx *mnt_ctx, bool *isdfs)if (!nodfs) { rc =dfs_get_referral (mnt_ctx, ctx->UNC +1 ,NULL ,NULL );if (rc) { -if (rc != -ENOENT && rc != -EOPNOTSUPP && rc != -EIO ) -return rc; +cifs_dbg (FYI ,"%s: no dfs referral for %s: %d\n" , + __func__, ctx->UNC +1 , rc); +cifs_dbg (FYI ,"%s: assuming non-dfs mount...\n" , __func__); nodfs = true; } } --2.41.0
Signature · 3 lines
Thanks, Steve
Re: [PATCH 4/4] smb: client: improve DFS mount check
In reply to Paulo Alcantarafs/smb/client/dfs.c
Quoted 12 lines · Paulo Alcantara
Some servers may return error codes from
REQ_GET_DFS_REFERRALrequests that are unexpected by the client, so to make it easier, assume non-DFS mounts when the client can't get the initial DFS referral of @ctx->UNC indfs_mount_share().Signed-off-by Paulo Alcantara (SUSE) <[email protected]>--- fs/smb/client/dfs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)fs/smb/client/dfs.c +0
-0
Stable team, could you please pick this up as a fix for
8e3554150d6c ("cifs: fix sharing of DFS connections")The upstream commit is 5f2a0afa9890 ("smb: client: improve DFS mount check").
Thanks.
Greg KH
maintainerRe: [PATCH 4/4] smb: client: improve DFS mount check
Quoted 12 lines · Paulo Alcantara
Quoted 10 lines · Paulo Alcantara
Some servers may return error codes from
REQ_GET_DFS_REFERRALrequests that are unexpected by the client, so to make it easier, assume non-DFS mounts when the client can't get the initial DFS referral of @ctx->UNC indfs_mount_share().Signed-off-by Paulo Alcantara (SUSE) <[email protected]>--- fs/smb/client/dfs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Quoted 8 lines
fs/smb/client/dfs.c
Quoted 2 lines
fs/smb/client/dfs.c +0
-0Stable team, could you please pick this up as a fix for
8e3554150d6c ("cifs: fix sharing of DFS connections")The upstream commit is
5f2a0afa9890("smb: client: improve DFS mount check").
Does not apply cleanly, can you provide a working backport?
thanks,
greg k-h
Re: [PATCH 4/4] smb: client: improve DFS mount check
Hi Greg,
Quoted 18 lines · Greg KH
Quoted 17 lines · Paulo Alcantara
fs/smb/client/dfs.c
Quoted 12 lines · Paulo Alcantara
Some servers may return error codes from
REQ_GET_DFS_REFERRALrequests that are unexpected by the client, so to make it easier, assume non-DFS mounts when the client can't get the initial DFS referral of @ctx->UNC indfs_mount_share().Signed-off-by Paulo Alcantara (SUSE) <[email protected]>--- fs/smb/client/dfs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)fs/smb/client/dfs.c +0
-0Stable team, could you please pick this up as a fix for
Quoted 5 lines
Quoted 3 lines
8e3554150d6c ("cifs: fix sharing of DFS connections")The upstream commit is
5f2a0afa9890("smb: client: improve DFS mount check").Does not apply cleanly, can you provide a working backport?
Find attached backport of
From 435048ee0f477947d1d93f5a9b60b2d2df2b7554 Mon Sep 17 00:00:00 2001
From: Paulo Alcantara <[email protected]>
Date: Tue, 27 Jun 2023 21:24:50 -0300
Subject: [PATCH stable v6.3] smb: client: improve DFS mount check
Some servers may return error codes from REQ_GET_DFS_REFERRAL requests that are unexpected by the client, so to make it easier, assume non-DFS mounts when the client can't get the initial DFS referral of @ctx->UNC in dfs_mount_share().
--- fs/cifs/dfs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/cifs/dfs.c +3 -2
@@ -296,8 +296,9 @@ int dfs_mount_share(struct cifs_mount_ctx *mnt_ctx, bool *isdfs)if (!nodfs) { rc =dfs_get_referral (mnt_ctx, ctx->UNC +1 ,NULL ,NULL );if (rc) { -if (rc != -ENOENT && rc != -EOPNOTSUPP && rc != -EIO ) -return rc; +cifs_dbg (FYI ,"%s: no dfs referral for %s: %d\n" , + __func__, ctx->UNC +1 , rc); +cifs_dbg (FYI ,"%s: assuming non-dfs mount...\n" , __func__); nodfs = true; } }
Signature · 1 line
2.41.0
5f2a0afa9890 ("smb: client: improve DFS mount check").for v6.3.y.
And for v6.4.y, please take these
d439b29057e2 ("smb: client: fix broken file attrs with nodfs mounts") 49024ec8795e ("smb: client: fix parsing of source mount option") 3ae872de4107 ("smb: client: fix shared DFS root mounts with different prefixes") 49024ec8795e ("smb: client: fix parsing of source mount option")
Thanks.
Greg KH
maintainerRe: [PATCH 4/4] smb: client: improve DFS mount check
Quoted 26 lines · Paulo Alcantara
Hi Greg,
Quoted 22 lines · Greg KH
Quoted 20 lines · Paulo Alcantara
fs/smb/client/dfs.c
Quoted 12 lines · Paulo Alcantara
Some servers may return error codes from
REQ_GET_DFS_REFERRALrequests that are unexpected by the client, so to make it easier, assume non-DFS mounts when the client can't get the initial DFS referral of @ctx->UNC indfs_mount_share().Signed-off-by Paulo Alcantara (SUSE) <[email protected]>--- fs/smb/client/dfs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)fs/smb/client/dfs.c +0
-0Stable team, could you please pick this up as a fix for
8e3554150d6c ("cifs: fix sharing of DFS connections")The upstream commit is
5f2a0afa9890("smb: client: improve DFS mount check").
Quoted 8 lines
Quoted 1 line
Does not apply cleanly, can you provide a working backport?
Find attached backport of
Quoted 1 line
From
435048ee0f477947d1d93f5a9b60b2d2df2b7554Mon Sep 17 00:00:00 2001From: Paulo Alcantara <[email protected]>
Date: Tue, 27 Jun 2023 21:24:50 -0300
Subject: [PATCH stable v6.3] smb: client: improve DFS mount check
I'm confused, 6.3.y is end-of-life, and:
Quoted 10 lines
Some servers may return error codes from
REQ_GET_DFS_REFERRALrequests that are unexpected by the client, so to make it easier, assume non-DFS mounts when the client can't get the initial DFS referral of @ctx->UNC indfs_mount_share().Signed-off-by Paulo Alcantara (SUSE) <[email protected]>Signed-off-by Steve French <[email protected]>--- fs/cifs/dfs.c | 5 +++--
This file is not in the 6.4.y or any older kernel tree.
So what tree did you make this against, and where should it be applied to?
totally confused,
greg k-h
Re: [PATCH 4/4] smb: client: improve DFS mount check
Quoted 49 lines · Greg KH
Quoted 26 lines · Paulo Alcantara
Hi Greg,
Quoted 22 lines · Greg KH
Quoted 20 lines · Paulo Alcantara
fs/smb/client/dfs.c
Quoted 12 lines · Paulo Alcantara
Some servers may return error codes from
REQ_GET_DFS_REFERRALrequests that are unexpected by the client, so to make it easier, assume non-DFS mounts when the client can't get the initial DFS referral of @ctx->UNC indfs_mount_share().Signed-off-by Paulo Alcantara (SUSE) <[email protected]>--- fs/smb/client/dfs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)fs/smb/client/dfs.c +0
-0Stable team, could you please pick this up as a fix for
8e3554150d6c ("cifs: fix sharing of DFS connections")The upstream commit is
5f2a0afa9890("smb: client: improve DFS mount check").Quoted 8 lines
Quoted 1 line
Does not apply cleanly, can you provide a working backport?
Find attached backport of
Quoted 1 line
From
435048ee0f477947d1d93f5a9b60b2d2df2b7554Mon Sep 17 00:00:00 2001From: Paulo Alcantara <[email protected]>
Date: Tue, 27 Jun 2023 21:24:50 -0300
Subject: [PATCH stable v6.3] smb: client: improve DFS mount checkI'm confused, 6.3.y is end-of-life, and:
Quoted 10 lines
Some servers may return error codes from
REQ_GET_DFS_REFERRALrequests that are unexpected by the client, so to make it easier, assume non-DFS mounts when the client can't get the initial DFS referral of @ctx->UNC indfs_mount_share().Signed-off-by Paulo Alcantara (SUSE) <[email protected]>Signed-off-by Steve French <[email protected]>--- fs/cifs/dfs.c | 5 +++--
Quoted 4 lines
This file is not in the 6.4.y or any older kernel tree.
So what tree did you make this against, and where should it be applied to?
Err, sorry about missing the EOL of 6.3.y. The attached patch was based on v6.3.13 from the stable tree[1], where it didn't have the rename from "fs/cifs" to "fs/smb/client" yet. Please ignore the attached patch.
So, the commit
5f2a0afa9890 ("smb: client: improve DFS mount check")
should be applied to 6.4.y. I've checked that it applies cleanly against linux-6.4.y from the linux-stable-rc tree[2].
Thanks.
[1] git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
[2] git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
Greg KH
maintainerRe: [PATCH 4/4] smb: client: improve DFS mount check
Quoted 61 lines · Paulo Alcantara
Quoted 49 lines · Greg KH
Quoted 26 lines · Paulo Alcantara
Hi Greg,
Quoted 22 lines · Greg KH
Quoted 20 lines · Paulo Alcantara
fs/smb/client/dfs.c
Quoted 12 lines · Paulo Alcantara
Some servers may return error codes from
REQ_GET_DFS_REFERRALrequests that are unexpected by the client, so to make it easier, assume non-DFS mounts when the client can't get the initial DFS referral of @ctx->UNC indfs_mount_share().Signed-off-by Paulo Alcantara (SUSE) <[email protected]>--- fs/smb/client/dfs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)fs/smb/client/dfs.c +0
-0Stable team, could you please pick this up as a fix for
8e3554150d6c ("cifs: fix sharing of DFS connections")The upstream commit is
5f2a0afa9890("smb: client: improve DFS mount check").Quoted 8 lines
Quoted 1 line
Does not apply cleanly, can you provide a working backport?
Find attached backport of
Quoted 1 line
From
435048ee0f477947d1d93f5a9b60b2d2df2b7554Mon Sep 17 00:00:00 2001From: Paulo Alcantara <[email protected]>
Date: Tue, 27 Jun 2023 21:24:50 -0300
Subject: [PATCH stable v6.3] smb: client: improve DFS mount checkI'm confused, 6.3.y is end-of-life, and:
Quoted 10 lines
Some servers may return error codes from
REQ_GET_DFS_REFERRALrequests that are unexpected by the client, so to make it easier, assume non-DFS mounts when the client can't get the initial DFS referral of @ctx->UNC indfs_mount_share().Signed-off-by Paulo Alcantara (SUSE) <[email protected]>Signed-off-by Steve French <[email protected]>--- fs/cifs/dfs.c | 5 +++--Quoted 4 lines
This file is not in the 6.4.y or any older kernel tree.
So what tree did you make this against, and where should it be applied to?
Err, sorry about missing the EOL of 6.3.y. The attached patch was based on v6.3.13 from the stable tree[1], where it didn't have the rename from "fs/cifs" to "
fs/smb/client" yet. Please ignore the attached patch.
Quoted 6 lines
So, the commit
5f2a0afa9890("smb: client: improve DFS mount check")should be applied to 6.4.y. I've checked that it applies cleanly against linux-6.4.y from the linux-stable-rc tree[2].
Now queued up, thanks.
greg k-h
tentatively merged patches
Quoted 322 lines · Paulo Alcantara
Handle trailing and leading separators when parsing UNC and prefix paths in
smb3_parse_devname(). Then, store the sanitised paths insmb3_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 argumentThe
-EINVALwas returned because the client sentSMB2_CREATE"\\d0\f0" rather thanSMB2_CREATE"\d0\f0".$ mount //srv//share /mnt/1 -o ... mount: Invalid argumentThe
-EINVALwas returned correctly although the client only realised it after sending a couple of bad requests rather than bailing out earlier when parsing mount options.Signed-off-by Paulo Alcantara (SUSE) <[email protected]>--- fs/smb/client/cifs_dfs_ref.c | 28 +++++++++++------ fs/smb/client/cifsproto.h | 2 ++ fs/smb/client/dfs.c | 38 ++--------------------- fs/smb/client/fs_context.c | 59 ++++++++++++++++++++++++++++++------ fs/smb/client/misc.c | 17 +++++++---- 5 files changed, 84 insertions(+), 60 deletions(-)fs/smb/client/cifs_dfs_ref.c +18
-10@@ -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); -if (rc) { - mnt =ERR_PTR (rc); - goto out; - } - rc =smb3_parse_devname (full_path, ctx); +if (rc) { + mnt =ERR_PTR (rc); + goto out; + } + + 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@@ -442,14 +442,17 @@ int smb3_parse_opt(const char *options, const char *key, char **val)* but there are some bugs that prevent rename from working if there are * multiple delimiters. * -* Returns a sanitized duplicate of @path. @gfp indicates the GFP_* flags -* for kstrdup. +* Return a sanitized duplicate of @path or NULL for empty prefix paths. +* Otherwise, return ERR_PTR. +* +* @gfp indicates the GFP_* flags for kstrdup. * The caller is responsible for freeing the original. */ #define IS_DELIM (c) ((c) == '/' || (c) == '\\')char *cifs_sanitize_prepath (char *prepath,gfp_t gfp) {char *cursor1 = prepath, *cursor2 = prepath; +char *s;/* skip all prepended delimiters */ while (IS_DELIM (*cursor1))@@ -470,8 +473,39 @@ char *cifs_sanitize_prepath(char *prepath, gfp_t gfp)if (IS_DELIM (*(cursor2 -1 ))) cursor2--; - *(cursor2) ='\0' ; -return kstrdup (prepath, gfp); + *cursor2 ='\0' ; +if (!*prepath) +return NULL ; + s =kstrdup (prepath, gfp); +if (!s) +return ERR_PTR (-ENOMEM ); +return s; +} + +/* +* Return full path based on the values of @ctx->{UNC,prepath}. +* +* It is assumed that both values were already parsed by smb3_parse_devname(). +*/ +char *smb3_fs_context_fullpath (const struct smb3_fs_context *ctx,char dirsep) +{ +size_t ulen, plen; +char *s; + + ulen =strlen (ctx->UNC); + plen = ctx->prepath ?strlen (ctx->prepath) +1 :0 ; + + s =kmalloc (ulen + plen +1 ,GFP_KERNEL ); +if (!s) +return ERR_PTR (-ENOMEM ); +memcpy (s, ctx->UNC, ulen); +if (plen) { + s[ulen] = dirsep; +memcpy (s + ulen +1 , ctx->prepath, plen); + } + s[ulen + plen] ='\0' ; +convert_delimiter (s, dirsep); +return s; }/* @@ -485,6 +519,7 @@ smb3_parse_devname(const char *devname, struct smb3_fs_context *ctx)char *pos;const char *delims ="/\\" ;size_t len; +int rc;if (unlikely (!devname || !*devname)) {cifs_dbg (VFS ,"Device name not specified\n" );@@ -512,6 +547,8 @@ smb3_parse_devname(const char *devname, struct smb3_fs_context *ctx)/* now go until next delimiter or end of string */ len =strcspn (pos, delims); +if (!len) +return -EINVAL ;/* move "pos" up to delimiter or NULL */ pos += len;@@ -534,8 +571,11 @@ smb3_parse_devname(const char *devname, struct smb3_fs_context *ctx)return 0 ; ctx->prepath =cifs_sanitize_prepath (pos,GFP_KERNEL ); -if (!ctx->prepath) -return -ENOMEM ; +if (IS_ERR (ctx->prepath)) { + rc =PTR_ERR (ctx->prepath); + ctx->prepath =NULL ; +return rc; + }return 0 ; }@@ -1150,12 +1190,13 @@ static int smb3_fs_context_parse_param(struct fs_context *fc,cifs_errorf (fc,"Unknown error parsing devname\n" ); goto cifs_parse_mount_err; } - ctx->source =kstrdup (param->string,GFP_KERNEL ); -if (ctx->source ==NULL ) { + ctx->source =smb3_fs_context_fullpath (ctx,'/' ); +if (IS_ERR (ctx->source)) { + ctx->source =NULL ;cifs_errorf (fc,"OOM when copying UNC string\n" ); goto cifs_parse_mount_err; } - fc->source =kstrdup (param->string,GFP_KERNEL ); + fc->source =kstrdup (ctx->source,GFP_KERNEL );if (fc->source ==NULL ) {cifs_errorf (fc,"OOM when copying UNC string\n" ); goto cifs_parse_mount_err;fs/smb/client/misc.c +11
-7@@ -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 ; --2.41.0
Signature · 3 lines
Thanks, Steve