Commit 609120c5 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sctp-fixes' 



Jere Leppänen says:

====================
sctp: Fix problems with peer restart when in SHUTDOWN-PENDING state and socket is closed

These patches are related to the scenario described in commit
bdf6fa52 ("sctp: handle association restarts when the socket is
closed."). To recap, when our association is in SHUTDOWN-PENDING state
and we've closed our one-to-one socket, while the peer crashes without
being detected, restarts and reconnects using the same addresses and
ports, we start association shutdown.

In this case, Cumulative TSN Ack in the SHUTDOWN that we send has
always been incorrect. Additionally, bundling of the SHUTDOWN with the
COOKIE-ACK was broken by a later commit. This series fixes both of
these issues.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 72579e14 12dfd78e

net/sctp/sm_make_chunk.c

+5 −1
Original line number Diff line number Diff line
@@ -858,7 +858,11 @@ struct sctp_chunk *sctp_make_shutdown(const struct sctp_association *asoc, 
	struct sctp_chunk *retval;

	__u32 ctsn;



	if (chunk && chunk->asoc)

		ctsn = sctp_tsnmap_get_ctsn(&chunk->asoc->peer.tsn_map);

	else

		ctsn = sctp_tsnmap_get_ctsn(&asoc->peer.tsn_map);



	shut.cum_tsn_ack = htonl(ctsn);



	retval = sctp_make_control(asoc, SCTP_CID_SHUTDOWN, 0,

net/sctp/sm_statefuns.c

+3 −3
Original line number Diff line number Diff line
@@ -1865,7 +1865,7 @@ static enum sctp_disposition sctp_sf_do_dupcook_a( 
		 */

		sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(repl));

		return sctp_sf_do_9_2_start_shutdown(net, ep, asoc,

						     SCTP_ST_CHUNK(0), NULL,

						     SCTP_ST_CHUNK(0), repl,

						     commands);

	} else {

		sctp_add_cmd_sf(commands, SCTP_CMD_NEW_STATE,
@@ -5470,7 +5470,7 @@ enum sctp_disposition sctp_sf_do_9_2_start_shutdown( 
	 * in the Cumulative TSN Ack field the last sequential TSN it

	 * has received from the peer.

	 */

	reply = sctp_make_shutdown(asoc, NULL);

	reply = sctp_make_shutdown(asoc, arg);

	if (!reply)

		goto nomem;
@@ -6068,7 +6068,7 @@ enum sctp_disposition sctp_sf_autoclose_timer_expire( 
	disposition = SCTP_DISPOSITION_CONSUME;

	if (sctp_outq_is_empty(&asoc->outqueue)) {

		disposition = sctp_sf_do_9_2_start_shutdown(net, ep, asoc, type,

							    arg, commands);

							    NULL, commands);

	}



	return disposition;

CRA Git | Maintained and supported by SUSTech CRA and CCSE