aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/connect.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2011-02-08 18:52:32 -0500
committerSteve French <sfrench@us.ibm.com>2011-02-08 18:52:32 -0500
commit7e90d705fc9f8c5e3a1549281dce0654d049243b (patch)
tree36752aa5c1005716d2ce91cbf020ab8c2602f129 /fs/cifs/connect.c
parent100b33c8bd8a3235fd0b7948338d6cbb3db3c63d (diff)
[CIFS] Do not send SMBEcho requests on new sockets until SMBNegotiate
In order to determine whether an SMBEcho request can be sent we need to know that the socket is established (server tcpStatus == CifsGood) AND that an SMB NegotiateProtocol has been sent (server maxBuf != 0). Without the second check we can send an Echo request during reconnection before the server can accept it. CC: JG <jg@cms.ac> Reviewed-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/connect.c')
-rw-r--r--fs/cifs/connect.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 257b6d895e20..10011e99b34d 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -341,7 +341,7 @@ cifs_echo_request(struct work_struct *work)
341 * We cannot send an echo until the NEGOTIATE_PROTOCOL request is done. 341 * We cannot send an echo until the NEGOTIATE_PROTOCOL request is done.
342 * Also, no need to ping if we got a response recently 342 * Also, no need to ping if we got a response recently
343 */ 343 */
344 if (server->tcpStatus != CifsGood || 344 if ((server->tcpStatus != CifsGood) || (server->maxBuf == 0) ||
345 time_before(jiffies, server->lstrp + SMB_ECHO_INTERVAL - HZ)) 345 time_before(jiffies, server->lstrp + SMB_ECHO_INTERVAL - HZ))
346 goto requeue_echo; 346 goto requeue_echo;
347 347