sctp: streams should be recovered when it fails to send request. (119aecba) · Commits · 戴 / test

Now when sending stream reset request, it closes the streams to block further xmit of data until this request is completed, then calls sctp_send_reconf to send the chunk. But if sctp_send_reconf returns err, and it doesn't recover the streams' states back, which means the request chunk would not be queued and sent, so the asoc will get stuck, streams are closed and no packet is even queued. This patch is to fix it by recovering the streams' states when it fails to send the request, it is also to fix a return value. Fixes: ("sctp: implement sender-side procedures for SSN Reset Request Parameter") Signed-off-by:

Xin Long <lucien.xin@gmail.com> Acked-by:

Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/sctp/stream.c

+17 −2

Original line number	Original line	Diff line number	Diff line
	@@ -136,8 +136,10 @@ int sctp_send_reset_streams(struct sctp_association *asoc,
	goto out;		goto out;

	chunk = sctp_make_strreset_req(asoc, str_nums, str_list, out, in);		chunk = sctp_make_strreset_req(asoc, str_nums, str_list, out, in);
	if (!chunk)		if (!chunk) {
			retval = -ENOMEM;
	goto out;		goto out;
			}

	if (out) {		if (out) {
	if (str_nums)		if (str_nums)
	@@ -149,7 +151,6 @@ int sctp_send_reset_streams(struct sctp_association *asoc,
	stream->out[i].state = SCTP_STREAM_CLOSED;		stream->out[i].state = SCTP_STREAM_CLOSED;
	}		}

	asoc->strreset_outstanding = out + in;
	asoc->strreset_chunk = chunk;		asoc->strreset_chunk = chunk;
	sctp_chunk_hold(asoc->strreset_chunk);		sctp_chunk_hold(asoc->strreset_chunk);

	@@ -157,8 +158,22 @@ int sctp_send_reset_streams(struct sctp_association *asoc,
	if (retval) {		if (retval) {
	sctp_chunk_put(asoc->strreset_chunk);		sctp_chunk_put(asoc->strreset_chunk);
	asoc->strreset_chunk = NULL;		asoc->strreset_chunk = NULL;
			if (!out)
			goto out;

			if (str_nums)
			for (i = 0; i < str_nums; i++)
			stream->out[str_list[i]].state =
			SCTP_STREAM_OPEN;
			else
			for (i = 0; i < stream->outcnt; i++)
			stream->out[i].state = SCTP_STREAM_OPEN;

			goto out;
	}		}

			asoc->strreset_outstanding = out + in;

	out:		out:
	return retval;		return retval;
	}		}

Admin message