1 files changed, 26 insertions, 25 deletions

diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 71cad56dd73f..177528ed3e1b 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -264,7 +264,6 @@ sctp_disposition_t sctp_sf_do_5_1B_init(const struct sctp_endpoint *ep,
         struct sctp_chunk *err_chunk;
         struct sctp_packet *packet;
         sctp_unrecognized_param_t *unk_param;
-        struct sock *sk;
         int len;
 
         /* 6.10 Bundling
@@ -285,16 +284,6 @@ sctp_disposition_t sctp_sf_do_5_1B_init(const struct sctp_endpoint *ep,
         if (ep == sctp_sk((sctp_get_ctl_sock()))->ep)
                 return sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands);
 
-        sk = ep->base.sk;
-        /* If the endpoint is not listening or if the number of associations
-         * on the TCP-style socket exceed the max backlog, respond with an
-         * ABORT.
-         */
-        if (!sctp_sstate(sk, LISTENING) ||
-            (sctp_style(sk, TCP) &&
-             sk_acceptq_is_full(sk)))
-                return sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands);
-
         /* 3.1 A packet containing an INIT chunk MUST have a zero Verification
          * Tag.
          */
@@ -590,6 +579,7 @@ sctp_disposition_t sctp_sf_do_5_1D_ce(const struct sctp_endpoint *ep,
         struct sctp_ulpevent *ev, *ai_ev = NULL;
         int error = 0;
         struct sctp_chunk *err_chk_p;
+        struct sock *sk;
 
         /* If the packet is an OOTB packet which is temporarily on the
          * control endpoint, respond with an ABORT.
@@ -605,6 +595,15 @@ sctp_disposition_t sctp_sf_do_5_1D_ce(const struct sctp_endpoint *ep,
         if (!sctp_chunk_length_valid(chunk, sizeof(sctp_chunkhdr_t)))
                 return sctp_sf_pdiscard(ep, asoc, type, arg, commands);
 
+        /* If the endpoint is not listening or if the number of associations
+         * on the TCP-style socket exceed the max backlog, respond with an
+         * ABORT.
+         */
+        sk = ep->base.sk;
+        if (!sctp_sstate(sk, LISTENING) ||
+            (sctp_style(sk, TCP) && sk_acceptq_is_full(sk)))
+                return sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands);
+
         /* "Decode" the chunk.  We have no optional parameters so we
          * are in good shape.
          */
@@ -1032,19 +1031,21 @@ sctp_disposition_t sctp_sf_backbeat_8_3(const struct sctp_endpoint *ep,
         /* This should never happen, but lets log it if so.  */
         if (unlikely(!link)) {
                 if (from_addr.sa.sa_family == AF_INET6) {
-                        printk(KERN_WARNING
-                               "%s association %p could not find address "
-                               NIP6_FMT "\n",
-                               __FUNCTION__,
-                               asoc,
-                               NIP6(from_addr.v6.sin6_addr));
+                        if (net_ratelimit())
+                                printk(KERN_WARNING
+                                    "%s association %p could not find address "
+                                    NIP6_FMT "\n",
+                                    __FUNCTION__,
+                                    asoc,
+                                    NIP6(from_addr.v6.sin6_addr));
                 } else {
-                        printk(KERN_WARNING
-                               "%s association %p could not find address "
-                               NIPQUAD_FMT "\n",
-                               __FUNCTION__,
-                               asoc,
-                               NIPQUAD(from_addr.v4.sin_addr.s_addr));
+                        if (net_ratelimit())
+                                printk(KERN_WARNING
+                                    "%s association %p could not find address "
+                                    NIPQUAD_FMT "\n",
+                                    __FUNCTION__,
+                                    asoc,
+                                    NIPQUAD(from_addr.v4.sin_addr.s_addr));
                 }
                 return SCTP_DISPOSITION_DISCARD;
         }
@@ -3362,7 +3363,7 @@ sctp_disposition_t sctp_sf_do_asconf_ack(const struct sctp_endpoint *ep,
                 abort = sctp_make_abort(asoc, asconf_ack,
                                         sizeof(sctp_errhdr_t));
                 if (abort) {
-                        sctp_init_cause(abort, SCTP_ERROR_ASCONF_ACK, NULL, 0);
+                        sctp_init_cause(abort, SCTP_ERROR_ASCONF_ACK, 0);
                         sctp_add_cmd_sf(commands, SCTP_CMD_REPLY,
                                         SCTP_CHUNK(abort));
                 }
@@ -3392,7 +3393,7 @@ sctp_disposition_t sctp_sf_do_asconf_ack(const struct sctp_endpoint *ep,
                 abort = sctp_make_abort(asoc, asconf_ack,
                                         sizeof(sctp_errhdr_t));
                 if (abort) {
-                        sctp_init_cause(abort, SCTP_ERROR_RSRC_LOW, NULL, 0);
+                        sctp_init_cause(abort, SCTP_ERROR_RSRC_LOW, 0);
                         sctp_add_cmd_sf(commands, SCTP_CMD_REPLY,
                                         SCTP_CHUNK(abort));
                 }