History

cifs: fix check of tcon dfs in smb1

For SMB1, the DFS flag should be checked against tcon->Flags rather than tcon->share_flags. While at it, add an is_tcon_dfs() helper to check for DFS capability in a more generic way.

Paulo Alcantara committed 6 years ago

Commit e1837851 parent d012a712 files · +16 −1Browse files

Unified · Split

2 files
  1. fs/cifs/cifsglob.h +15 −0
  2. fs/cifs/connect.c +1 −1
fs/cifs/cifsglob.h+15−0
@@ -2031,4 +2031,19 @@ static inline bool is_smb1_server(struct TCP_Server_Info *server) · 2030 unmodified lines
2031 return strcmp(server->vals->version_string, SMB1_VERSION_STRING) == 0;2031 return strcmp(server->vals->version_string, SMB1_VERSION_STRING) == 0;
2032}2032}
2033 2033
2034static inline bool is_tcon_dfs(struct cifs_tcon *tcon)
2035{
2036 /*
2037 * For SMB1, see MS-CIFS 2.4.55 SMB_COM_TREE_CONNECT_ANDX (0x75) and MS-CIFS 3.3.4.4 DFS
2038 * Subsystem Notifies That a Share Is a DFS Share.
2039 *
2040 * For SMB2+, see MS-SMB2 2.2.10 SMB2 TREE_CONNECT Response and MS-SMB2 3.3.4.14 Server
2041 * Application Updates a Share.
2042 */
2043 if (!tcon || !tcon->ses || !tcon->ses->server)
2044 return false;
2045 return is_smb1_server(tcon->ses->server) ? tcon->Flags & SMB_SHARE_IS_IN_DFS :
2046 tcon->share_flags & (SHI1005_FLAGS_DFS | SHI1005_FLAGS_DFS_ROOT);
2047}
2048
2034#endif /* _CIFS_GLOB_H */2049#endif /* _CIFS_GLOB_H */
fs/cifs/connect.c+1−1
@@ -4909,7 +4909,7 @@ int cifs_mount(struct cifs_sb_info *cifs_sb, struct smb_vol *vol) · 4908 unmodified lines
4909 if (!tcon)4909 if (!tcon)
4910 continue;4910 continue;
4911 /* Make sure that requests go through new root servers */4911 /* Make sure that requests go through new root servers */
4912 if (tcon->share_flags & (SHI1005_FLAGS_DFS | SHI1005_FLAGS_DFS_ROOT)) {4912 if (is_tcon_dfs(tcon)) {
4913 put_root_ses(root_ses);4913 put_root_ses(root_ses);
4914 set_root_ses(cifs_sb, ses, &root_ses);4914 set_root_ses(cifs_sb, ses, &root_ses);
4915 }4915 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t