2 files changed, 10 insertions, 0 deletions

diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 7288192f7df5..50225dd2e6dc 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -334,6 +334,15 @@ sctp_disposition_t sctp_sf_do_5_1B_init(const struct sctp_endpoint *ep,
         if (!sctp_chunk_length_valid(chunk, sizeof(sctp_init_chunk_t)))
                 return sctp_sf_pdiscard(ep, asoc, type, arg, commands);
 
+        /* If the INIT is coming toward a closing socket, we'll send back
+         * and ABORT.  Essentially, this catches the race of INIT being
+         * backloged to the socket at the same time as the user isses close().
+         * Since the socket and all its associations are going away, we
+         * can treat this OOTB
+         */
+        if (sctp_sstate(ep->base.sk, CLOSING))
+                return sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands);
+
         /* Verify the INIT chunk before processing it. */
         err_chunk = NULL;
         if (!sctp_verify_init(asoc, chunk->chunk_hdr->type,
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 971890dbfea0..a7e544e3f28a 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -1361,6 +1361,7 @@ SCTP_STATIC void sctp_close(struct sock *sk, long timeout)
 
         sctp_lock_sock(sk);
         sk->sk_shutdown = SHUTDOWN_MASK;
+        sk->sk_state = SCTP_SS_CLOSING;
 
         ep = sctp_sk(sk)->ep;