Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad313cb8 authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

cifs: on send failure, readjust server sequence number downward 



If sending a call to the server fails for some reason (for instance, the
sending thread caught a signal), then we must readjust the sequence
number downward again or the next send will have it too high.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
parent ce6c44e4

fs/cifs/smb1ops.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -61,6 +61,9 @@ send_nt_cancel(struct TCP_Server_Info *server, void *buf, 
	 */

	 */

	--server->sequence_number;

	--server->sequence_number;

	rc = smb_send(server, in_buf, be32_to_cpu(in_buf->smb_buf_length));

	rc = smb_send(server, in_buf, be32_to_cpu(in_buf->smb_buf_length));

	if (rc < 0)

		server->sequence_number--;



	mutex_unlock(&server->srv_mutex);

	mutex_unlock(&server->srv_mutex);





	cifs_dbg(FYI, "issued NT_CANCEL for mid %u, rc = %d\n",

	cifs_dbg(FYI, "issued NT_CANCEL for mid %u, rc = %d\n",

fs/cifs/transport.c

+13 −0
Original line number Original line Diff line number Diff line
@@ -522,6 +522,9 @@ cifs_call_async(struct TCP_Server_Info *server, struct smb_rqst *rqst, 
	rc = smb_send_rqst(server, rqst);

	rc = smb_send_rqst(server, rqst);

	cifs_in_send_dec(server);

	cifs_in_send_dec(server);

	cifs_save_when_sent(mid);

	cifs_save_when_sent(mid);



	if (rc < 0)

		server->sequence_number -= 2;

	mutex_unlock(&server->srv_mutex);

	mutex_unlock(&server->srv_mutex);





	if (rc == 0)

	if (rc == 0)
@@ -711,6 +714,8 @@ SendReceive2(const unsigned int xid, struct cifs_ses *ses, 
	cifs_in_send_dec(ses->server);

	cifs_in_send_dec(ses->server);

	cifs_save_when_sent(midQ);

	cifs_save_when_sent(midQ);





	if (rc < 0)

		ses->server->sequence_number -= 2;

	mutex_unlock(&ses->server->srv_mutex);

	mutex_unlock(&ses->server->srv_mutex);





	if (rc < 0) {

	if (rc < 0) {
@@ -835,6 +840,10 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses, 
	rc = smb_send(ses->server, in_buf, be32_to_cpu(in_buf->smb_buf_length));

	rc = smb_send(ses->server, in_buf, be32_to_cpu(in_buf->smb_buf_length));

	cifs_in_send_dec(ses->server);

	cifs_in_send_dec(ses->server);

	cifs_save_when_sent(midQ);

	cifs_save_when_sent(midQ);



	if (rc < 0)

		ses->server->sequence_number -= 2;



	mutex_unlock(&ses->server->srv_mutex);

	mutex_unlock(&ses->server->srv_mutex);





	if (rc < 0)

	if (rc < 0)
@@ -968,6 +977,10 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifs_tcon *tcon, 
	rc = smb_send(ses->server, in_buf, be32_to_cpu(in_buf->smb_buf_length));

	rc = smb_send(ses->server, in_buf, be32_to_cpu(in_buf->smb_buf_length));

	cifs_in_send_dec(ses->server);

	cifs_in_send_dec(ses->server);

	cifs_save_when_sent(midQ);

	cifs_save_when_sent(midQ);



	if (rc < 0)

		ses->server->sequence_number -= 2;



	mutex_unlock(&ses->server->srv_mutex);

	mutex_unlock(&ses->server->srv_mutex);





	if (rc < 0) {

	if (rc < 0) {