Commit 779edd73 authored Nov 25, 2017 by Xin Long Committed by David S. Miller Dec 01, 2017

sctp: do not abandon the other frags in unsent outq if one msg has outstanding frags



Now for the abandoned chunks in unsent outq, it would just free the chunks.
Because no tsn is assigned to them yet, there's no need to send fwd tsn to
peer, unlike for the abandoned chunks in sent outq.

The problem is when parts of the msg have been sent and the other frags
are still in unsent outq, if they are abandoned/dropped, the peer would
never get this msg reassembled.

So these frags in unsent outq can't be dropped if this msg already has
outstanding frags.

This patch does the check in sctp_chunk_abandoned and
sctp_prsctp_prune_unsent.

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>

parent e5f61296

net/sctp/chunk.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -308,6 +308,10 @@ int sctp_chunk_abandoned(struct sctp_chunk *chunk)
		if (chunk->msg->abandoned)
		return 1;

		if (!chunk->has_tsn &&
		!(chunk->chunk_hdr->flags & SCTP_DATA_FIRST_FRAG))
		return 0;

		if (SCTP_PR_TTL_ENABLED(chunk->sinfo.sinfo_flags) &&
		time_after(jiffies, chunk->msg->expires_at)) {
		struct sctp_stream_out *streamout =

net/sctp/outqueue.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -407,7 +407,8 @@ static int sctp_prsctp_prune_unsent(struct sctp_association *asoc,

		list_for_each_entry_safe(chk, temp, &q->out_chunk_list, list) {
		if (!chk->msg->abandoned &&
		(!SCTP_PR_PRIO_ENABLED(chk->sinfo.sinfo_flags) \|\|
		(!(chk->chunk_hdr->flags & SCTP_DATA_FIRST_FRAG) \|\|
		!SCTP_PR_PRIO_ENABLED(chk->sinfo.sinfo_flags) \|\|
		chk->sinfo.sinfo_timetolive <= sinfo->sinfo_timetolive))
		continue;

Admin message