3ae872de41
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
Fixes: 8e3554150d ("cifs: fix sharing of DFS connections")
Signed-off-by: Paulo Alcantara (SUSE) <pc@manguebit.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
85 lines
2.1 KiB
C
85 lines
2.1 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* Copyright (c) 2022 Paulo Alcantara <palcantara@suse.de>
|
|
*/
|
|
|
|
#ifndef _CIFS_DFS_H
|
|
#define _CIFS_DFS_H
|
|
|
|
#include "cifsglob.h"
|
|
#include "fs_context.h"
|
|
#include "cifs_unicode.h"
|
|
|
|
struct dfs_root_ses {
|
|
struct list_head list;
|
|
struct cifs_ses *ses;
|
|
};
|
|
|
|
int dfs_parse_target_referral(const char *full_path, const struct dfs_info3_param *ref,
|
|
struct smb3_fs_context *ctx);
|
|
int dfs_mount_share(struct cifs_mount_ctx *mnt_ctx, bool *isdfs);
|
|
|
|
static inline char *dfs_get_path(struct cifs_sb_info *cifs_sb, const char *path)
|
|
{
|
|
return dfs_cache_canonical_path(path, cifs_sb->local_nls, cifs_remap(cifs_sb));
|
|
}
|
|
|
|
static inline int dfs_get_referral(struct cifs_mount_ctx *mnt_ctx, const char *path,
|
|
struct dfs_info3_param *ref, struct dfs_cache_tgt_list *tl)
|
|
{
|
|
struct smb3_fs_context *ctx = mnt_ctx->fs_ctx;
|
|
struct cifs_sb_info *cifs_sb = mnt_ctx->cifs_sb;
|
|
|
|
return dfs_cache_find(mnt_ctx->xid, ctx->dfs_root_ses, cifs_sb->local_nls,
|
|
cifs_remap(cifs_sb), path, ref, tl);
|
|
}
|
|
|
|
/* Return DFS full path out of a dentry set for automount */
|
|
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);
|
|
size_t len;
|
|
char *s;
|
|
|
|
spin_lock(&tcon->tc_lock);
|
|
if (unlikely(!tcon->origin_fullpath)) {
|
|
spin_unlock(&tcon->tc_lock);
|
|
return ERR_PTR(-EREMOTE);
|
|
}
|
|
spin_unlock(&tcon->tc_lock);
|
|
|
|
s = dentry_path_raw(dentry, page, PATH_MAX);
|
|
if (IS_ERR(s))
|
|
return s;
|
|
/* for root, we want "" */
|
|
if (!s[1])
|
|
s++;
|
|
|
|
spin_lock(&tcon->tc_lock);
|
|
len = strlen(tcon->origin_fullpath);
|
|
if (s < (char *)page + len) {
|
|
spin_unlock(&tcon->tc_lock);
|
|
return ERR_PTR(-ENAMETOOLONG);
|
|
}
|
|
|
|
s -= len;
|
|
memcpy(s, tcon->origin_fullpath, len);
|
|
spin_unlock(&tcon->tc_lock);
|
|
convert_delimiter(s, '/');
|
|
|
|
return s;
|
|
}
|
|
|
|
static inline void dfs_put_root_smb_sessions(struct list_head *head)
|
|
{
|
|
struct dfs_root_ses *root, *tmp;
|
|
|
|
list_for_each_entry_safe(root, tmp, head, list) {
|
|
list_del_init(&root->list);
|
|
cifs_put_smb_ses(root->ses);
|
|
kfree(root);
|
|
}
|
|
}
|
|
|
|
#endif /* _CIFS_DFS_H */
|