Commit 64519440 authored by Xin Long's avatar Xin Long Committed by David S. Miller
Browse files

sctp: save transmit error to sk_err in sctp_outq_flush 



Every time when sctp calls sctp_outq_flush, it sends out the chunks of
control queue, retransmit queue and data queue. Even if some trunks are
failed to transmit, it still has to flush all the transports, as it's
the only chance to clean that transmit_list.

So the latest transmit error here should be returned back. This transmit
error is an internal error of sctp stack.

I checked all the places where it uses the transmit error (the return
value of sctp_outq_flush), most of them are actually just save it to
sk_err.

Except for sctp_assoc/endpoint_bh_rcv, they will drop the chunk if
it's failed to send a REPLY, which is actually incorrect, as we can't
be sure the error that sctp_outq_flush returns is from sending that
REPLY.

So it's meaningless for sctp_outq_flush to return error back.

This patch is to save transmit error to sk_err in sctp_outq_flush, the
new error can update the old value. Eventually, sctp_wait_for_* would
check for it.

Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b61c654f

net/sctp/output.c

+2 −1
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ sctp_xmit_t sctp_packet_transmit_chunk(struct sctp_packet *packet, 
				       int one_packet, gfp_t gfp)

{

	sctp_xmit_t retval;

	int error = 0;



	pr_debug("%s: packet:%p size:%Zu chunk:%p size:%d\n", __func__,

		 packet, packet->size, chunk, chunk->skb ? chunk->skb->len : -1);
@@ -188,6 +187,8 @@ sctp_xmit_t sctp_packet_transmit_chunk(struct sctp_packet *packet, 
	switch ((retval = (sctp_packet_append_chunk(packet, chunk)))) {

	case SCTP_XMIT_PMTU_FULL:

		if (!packet->has_cookie_echo) {

			int error = 0;



			error = sctp_packet_transmit(packet, gfp);

			if (error < 0)

				chunk->skb->sk->sk_err = -error;

net/sctp/outqueue.c

+12 −9
Original line number Diff line number Diff line
@@ -533,7 +533,6 @@ void sctp_retransmit(struct sctp_outq *q, struct sctp_transport *transport, 
		     sctp_retransmit_reason_t reason)

{

	struct net *net = sock_net(q->asoc->base.sk);

	int error = 0;



	switch (reason) {

	case SCTP_RTXR_T3_RTX:
@@ -577,10 +576,7 @@ void sctp_retransmit(struct sctp_outq *q, struct sctp_transport *transport, 
	 * will be flushed at the end.

	 */

	if (reason != SCTP_RTXR_FAST_RTX)

		error = sctp_outq_flush(q, /* rtx_timeout */ 1, GFP_ATOMIC);



	if (error)

		q->asoc->base.sk->sk_err = -error;

		sctp_outq_flush(q, /* rtx_timeout */ 1, GFP_ATOMIC);

}



/*
@@ -893,8 +889,10 @@ static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout, gfp_t gfp) 
			sctp_packet_config(&singleton, vtag, 0);

			sctp_packet_append_chunk(&singleton, chunk);

			error = sctp_packet_transmit(&singleton, gfp);

			if (error < 0)

				return error;

			if (error < 0) {

				asoc->base.sk->sk_err = -error;

				return 0;

			}

			break;



		case SCTP_CID_ABORT:
@@ -992,6 +990,8 @@ static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout, gfp_t gfp) 
		retran:

			error = sctp_outq_flush_rtx(q, packet,

						    rtx_timeout, &start_timer);

			if (error < 0)

				asoc->base.sk->sk_err = -error;



			if (start_timer) {

				sctp_transport_reset_t3_rtx(transport);
@@ -1166,14 +1166,17 @@ sctp_flush_out: 
						      struct sctp_transport,

						      send_ready);

		packet = &t->packet;

		if (!sctp_packet_empty(packet))

		if (!sctp_packet_empty(packet)) {

			error = sctp_packet_transmit(packet, gfp);

			if (error < 0)

				asoc->base.sk->sk_err = -error;

		}



		/* Clear the burst limited state, if any */

		sctp_transport_burst_reset(t);

	}



	return error;

	return 0;

}



/* Update unack_data based on the incoming SACK chunk */

CRA Git | Maintained and supported by SUSTech CRA and CCSE