2 files changed, 7 insertions, 3 deletions

diff --git a/net/sctp/auth.c b/net/sctp/auth.c
index 97e6ebd14500..ae367c82e512 100644
--- a/net/sctp/auth.c
+++ b/net/sctp/auth.c
@@ -420,15 +420,15 @@ struct sctp_shared_key *sctp_auth_get_shkey(
                                 const struct sctp_association *asoc,
                                 __u16 key_id)
 {
-        struct sctp_shared_key *key = NULL;
+        struct sctp_shared_key *key;
 
         /* First search associations set of endpoint pair shared keys */
         key_for_each(key, &asoc->endpoint_shared_keys) {
                 if (key->key_id == key_id)
-                        break;
+                        return key;
         }
 
-        return key;
+        return NULL;
 }
 
 /*
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 5df0c4bd415b..f98658782d4f 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -3865,6 +3865,10 @@ sctp_disposition_t sctp_sf_eat_auth(const struct sctp_endpoint *ep,
         struct sctp_chunk *err_chunk;
         sctp_ierror_t error;
 
+        /* Make sure that the peer has AUTH capable */
+        if (!asoc->peer.auth_capable)
+                return sctp_sf_unk_chunk(ep, asoc, type, arg, commands);
+
         if (!sctp_vtag_verify(chunk, asoc)) {
                 sctp_add_cmd_sf(commands, SCTP_CMD_REPORT_BAD_TAG,
                                 SCTP_NULL());