Skip to content

Commit 62a6cfd

Browse files
spuiuksmfrench
authored andcommitted
cifs: Do not send echoes before Negotiate is complete
commit 4fcd181 ("Fix reconnect to not defer smb3 session reconnect long after socket reconnect") added support for Negotiate requests to be initiated by echo calls. To avoid delays in calling echo after a reconnect, I added the patch introduced by the commit b8c6001 ("Call echo service immediately after socket reconnect"). This has however caused a regression with cifs shares which do not have support for echo calls to trigger Negotiate requests. On connections which need to call Negotiation, the echo calls trigger an error which triggers a reconnect which in turn triggers another echo call. This results in a loop which is only broken when an operation is performed on the cifs share. For an idle share, it can DOS a server. The patch uses the smb_operation can_echo() for cifs so that it is called only if connection has been already been setup. kernel bz: 194531 Signed-off-by: Sachin Prabhu <[email protected]> Tested-by: Jonathan Liu <[email protected]> Acked-by: Pavel Shilovsky <[email protected]> CC: Stable <[email protected]> Signed-off-by: Steve French <[email protected]>
1 parent 4f7d029 commit 62a6cfd

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

fs/cifs/smb1ops.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,6 +1015,15 @@ cifs_dir_needs_close(struct cifsFileInfo *cfile)
10151015
return !cfile->srch_inf.endOfSearch && !cfile->invalidHandle;
10161016
}
10171017

1018+
static bool
1019+
cifs_can_echo(struct TCP_Server_Info *server)
1020+
{
1021+
if (server->tcpStatus == CifsGood)
1022+
return true;
1023+
1024+
return false;
1025+
}
1026+
10181027
struct smb_version_operations smb1_operations = {
10191028
.send_cancel = send_nt_cancel,
10201029
.compare_fids = cifs_compare_fids,
@@ -1049,6 +1058,7 @@ struct smb_version_operations smb1_operations = {
10491058
.get_dfs_refer = CIFSGetDFSRefer,
10501059
.qfs_tcon = cifs_qfs_tcon,
10511060
.is_path_accessible = cifs_is_path_accessible,
1061+
.can_echo = cifs_can_echo,
10521062
.query_path_info = cifs_query_path_info,
10531063
.query_file_info = cifs_query_file_info,
10541064
.get_srv_inum = cifs_get_srv_inum,

0 commit comments

Comments
 (0)