1 files changed, 18 insertions, 0 deletions

diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index d247ed4ee42..b6aaa7e97d8 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -3377,6 +3377,15 @@ sctp_disposition_t sctp_sf_do_asconf(const struct sctp_endpoint *ep,
                 return sctp_sf_pdiscard(ep, asoc, type, arg, commands);
         }
 
+        /* ADD-IP: Section 4.1.1
+         * This chunk MUST be sent in an authenticated way by using
+         * the mechanism defined in [I-D.ietf-tsvwg-sctp-auth]. If this chunk
+         * is received unauthenticated it MUST be silently discarded as
+         * described in [I-D.ietf-tsvwg-sctp-auth].
+         */
+        if (!sctp_addip_noauth && !chunk->auth)
+                return sctp_sf_discard_chunk(ep, asoc, type, arg, commands);
+
         /* Make sure that the ASCONF ADDIP chunk has a valid length.  */
         if (!sctp_chunk_length_valid(chunk, sizeof(sctp_addip_chunk_t)))
                 return sctp_sf_violation_chunklen(ep, asoc, type, arg,
@@ -3463,6 +3472,15 @@ sctp_disposition_t sctp_sf_do_asconf_ack(const struct sctp_endpoint *ep,
                 return sctp_sf_pdiscard(ep, asoc, type, arg, commands);
         }
 
+        /* ADD-IP, Section 4.1.2:
+         * This chunk MUST be sent in an authenticated way by using
+         * the mechanism defined in [I-D.ietf-tsvwg-sctp-auth]. If this chunk
+         * is received unauthenticated it MUST be silently discarded as
+         * described in [I-D.ietf-tsvwg-sctp-auth].
+         */
+        if (!sctp_addip_noauth && !asconf_ack->auth)
+                return sctp_sf_discard_chunk(ep, asoc, type, arg, commands);
+
         /* Make sure that the ADDIP chunk has a valid length.  */
         if (!sctp_chunk_length_valid(asconf_ack, sizeof(sctp_addip_chunk_t)))
                 return sctp_sf_violation_chunklen(ep, asoc, type, arg,