diff options
| author |   Shyam Prasad N <sprasad@microsoft.com> | 2021-10-25 05:44:10 +0000 |
|---|---|---|
| committer |   Steve French <stfrench@microsoft.com> | 2022-01-07 20:09:23 -0600 |
| commit | bda487ac4bebf871255cc6f23e16f702cea0ca7c (patch) | |
| tree | c9002fe22f2e9294726411f82e012835ffef95ac /fs/cifs/smb2pdu.c | |
| parent | cifs: maintain a state machine for tcp/smb/tcon sessions (diff) | |
| download | linux-dev-bda487ac4bebf871255cc6f23e16f702cea0ca7c.tar.xz linux-dev-bda487ac4bebf871255cc6f23e16f702cea0ca7c.zip | |
cifs: avoid race during socket reconnect between send and recv
When a TCP connection gets reestablished by the sender in cifs_reconnect,
There is a chance for race condition with demultiplex thread waiting in
cifs_readv_from_socket on the old socket. It will now return -ECONNRESET.
This condition is handled by comparing socket pointer before and after
sock_recvmsg. If the socket pointer has changed, we should not call
cifs_reconnect again, but instead retry with new socket.
Also fixed another bug in my prev mchan commits.
We should always reestablish session (even if binding) on a channel
that needs reconnection.
Signed-off-by: Shyam Prasad N <sprasad@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to 'fs/cifs/smb2pdu.c')
| -rw-r--r-- | fs/cifs/smb2pdu.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index 2725e62470e4..8d471df69c59 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -276,7 +276,6 @@ smb2_reconnect(__le16 smb2_command, struct cifs_tcon *tcon, if (tcon->need_reconnect) goto skip_sess_setup; - rc = -EHOSTDOWN; goto out; } spin_unlock(&ses->chan_lock); @@ -3858,7 +3857,7 @@ SMB2_echo(struct TCP_Server_Info *server) .rq_nvec = 1 }; unsigned int total_len; - cifs_dbg(FYI, "In echo request\n"); + cifs_dbg(FYI, "In echo request for conn_id %lld\n", server->conn_id); spin_lock(&cifs_tcp_ses_lock); if (server->tcpStatus == CifsNeedNegotiate) { |