2 files changed, 17 insertions, 5 deletions

diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
index 238adf7978e9..694f7491731d 100644
--- a/net/sctp/sm_sideeffect.c
+++ b/net/sctp/sm_sideeffect.c
@@ -440,14 +440,26 @@ static void sctp_do_8_2_transport_strike(struct sctp_association *asoc,
         /* The check for association's overall error counter exceeding the
          * threshold is done in the state function.
          */
-        /* When probing UNCONFIRMED addresses, the association overall
-         * error count is NOT incremented
+        /* We are here due to a timer expiration.  If the timer was
+         * not a HEARTBEAT, then normal error tracking is done.
+         * If the timer was a heartbeat, we only increment error counts
+         * when we already have an outstanding HEARTBEAT that has not
+         * been acknowledged.
+         * Additionaly, some tranport states inhibit error increments.
          */
-        if (transport->state != SCTP_UNCONFIRMED)
+        if (!is_hb) {
                 asoc->overall_error_count++;
+                if (transport->state != SCTP_INACTIVE)
+                        transport->error_count++;
+         } else if (transport->hb_sent) {
+                if (transport->state != SCTP_UNCONFIRMED)
+                        asoc->overall_error_count++;
+                if (transport->state != SCTP_INACTIVE)
+                        transport->error_count++;
+        }
 
         if (transport->state != SCTP_INACTIVE &&
-            (transport->error_count++ >= transport->pathmaxrxt)) {
+            (transport->error_count > transport->pathmaxrxt)) {
                 SCTP_DEBUG_PRINTK_IPADDR("transport_strike:association %p",
                                          " transport IP: port:%d failed.\n",
                                          asoc,
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 7fb08a694917..45b8bcafd827 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -971,7 +971,7 @@ sctp_disposition_t sctp_sf_sendbeat_8_3(const struct sctp_endpoint *ep,
 {
         struct sctp_transport *transport = (struct sctp_transport *) arg;
 
-        if (asoc->overall_error_count > asoc->max_retrans) {
+        if (asoc->overall_error_count >= asoc->max_retrans) {
                 sctp_add_cmd_sf(commands, SCTP_CMD_SET_SK_ERR,
                                 SCTP_ERROR(ETIMEDOUT));
                 /* CMD_ASSOC_FAILED calls CMD_DELETE_TCB. */