diff options
| author |   Eugene Korenevsky <ekorenevsky@astralinux.ru> | 2022-01-14 22:53:00 +0300 |
|---|---|---|
| committer |   Steve French <stfrench@microsoft.com> | 2022-01-17 13:28:05 -0600 |
| commit | 7eacba3b00a3c35c1ad189f543b1995dd0bdca9c (patch) | |
| tree | 2249b6fcae12626374ee147383bf039757c22c05 /fs/cifs/smb2pdu.c | |
| parent | cifs: clean up an inconsistent indenting (diff) | |
| download | linux-dev-7eacba3b00a3c35c1ad189f543b1995dd0bdca9c.tar.xz linux-dev-7eacba3b00a3c35c1ad189f543b1995dd0bdca9c.zip | |
cifs: alloc_path_with_tree_prefix: do not append sep. if the path is empty
alloc_path_with_tree_prefix() concatenates tree prefix and the path.
Windows CIFS client does not add separator after the tree prefix if the path
is empty. Let's do the same.
This fixes mounting DFS namespaces with names containing non-ASCII symbols.
BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=215440
Signed-off-by: Eugene Korenevsky <ekorenevsky@astralinux.ru>
Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to 'fs/cifs/smb2pdu.c')
| -rw-r--r-- | fs/cifs/smb2pdu.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index 8d471df69c59..625e3e9cb614 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -2587,8 +2587,13 @@ alloc_path_with_tree_prefix(__le16 **out_path, int *out_size, int *out_len, cp = load_nls_default(); cifs_strtoUTF16(*out_path, treename, treename_len, cp); - UniStrcat(*out_path, sep); - UniStrcat(*out_path, path); + + /* Do not append the separator if the path is empty */ + if (path[0] != cpu_to_le16(0x0000)) { + UniStrcat(*out_path, sep); + UniStrcat(*out_path, path); + } + unload_nls(cp); return 0; |