2 files changed, 15 insertions, 3 deletions

diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index e7b69a7360e2..3be28fed5915 100644
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -567,6 +567,14 @@ void sctp_assoc_rm_peer(struct sctp_association *asoc,
         if (asoc->init_last_sent_to == peer)
                 asoc->init_last_sent_to = NULL;
 
+        /* If we remove the transport an SHUTDOWN was last sent to, set it
+         * to NULL. Combined with the update of the retran path above, this
+         * will cause the next SHUTDOWN to be sent to the next available
+         * transport, maintaining the cycle.
+         */
+        if (asoc->shutdown_last_sent_to == peer)
+                asoc->shutdown_last_sent_to = NULL;
+
         asoc->peer.transport_count--;
 
         sctp_transport_free(peer);
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 55a61aa69662..10abc07d42cb 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -5432,9 +5432,13 @@ sctp_disposition_t sctp_sf_t2_timer_expire(const struct sctp_endpoint *ep,
         if (!reply)
                 goto nomem;
 
-        /* Do some failure management (Section 8.2). */
-        sctp_add_cmd_sf(commands, SCTP_CMD_STRIKE,
-                        SCTP_TRANSPORT(asoc->shutdown_last_sent_to));
+        /* Do some failure management (Section 8.2).
+         * If we remove the transport an SHUTDOWN was last sent to, don't
+         * do failure management.
+         */
+        if (asoc->shutdown_last_sent_to)
+                sctp_add_cmd_sf(commands, SCTP_CMD_STRIKE,
+                                SCTP_TRANSPORT(asoc->shutdown_last_sent_to));
 
         /* Set the transport for the SHUTDOWN/ACK chunk and the timeout for
          * the T2-shutdown timer.