]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/blobdiff - net/sctp/sm_statefuns.c
Merge tag 'driver-core-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[mirror_ubuntu-artful-kernel.git] / net / sctp / sm_statefuns.c
index 8ec20a64a3f8055a0c3576627c5ec5dad7e99ca8..e03bb1aab4d095b65259c33f4fba6990e90f586b 100644 (file)
@@ -160,23 +160,22 @@ static sctp_disposition_t __sctp_sf_do_9_1_abort(struct net *net,
 /* Small helper function that checks if the chunk length
  * is of the appropriate length.  The 'required_length' argument
  * is set to be the size of a specific chunk we are testing.
- * Return Values:  1 = Valid length
- *                0 = Invalid length
+ * Return Values:  true  = Valid length
+ *                false = Invalid length
  *
  */
-static inline int
-sctp_chunk_length_valid(struct sctp_chunk *chunk,
-                          __u16 required_length)
+static inline bool
+sctp_chunk_length_valid(struct sctp_chunk *chunk, __u16 required_length)
 {
        __u16 chunk_length = ntohs(chunk->chunk_hdr->length);
 
        /* Previously already marked? */
        if (unlikely(chunk->pdiscard))
-               return 0;
+               return false;
        if (unlikely(chunk_length < required_length))
-               return 0;
+               return false;
 
-       return 1;
+       return true;
 }
 
 /**********************************************************
@@ -1022,6 +1021,34 @@ sctp_disposition_t sctp_sf_sendbeat_8_3(struct net *net,
        return SCTP_DISPOSITION_CONSUME;
 }
 
+/* resend asoc strreset_chunk.  */
+sctp_disposition_t sctp_sf_send_reconf(struct net *net,
+                                      const struct sctp_endpoint *ep,
+                                      const struct sctp_association *asoc,
+                                      const sctp_subtype_t type, void *arg,
+                                      sctp_cmd_seq_t *commands)
+{
+       struct sctp_transport *transport = arg;
+
+       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. */
+               sctp_add_cmd_sf(commands, SCTP_CMD_ASSOC_FAILED,
+                               SCTP_PERR(SCTP_ERROR_NO_ERROR));
+               SCTP_INC_STATS(net, SCTP_MIB_ABORTEDS);
+               SCTP_DEC_STATS(net, SCTP_MIB_CURRESTAB);
+               return SCTP_DISPOSITION_DELETE_TCB;
+       }
+
+       sctp_chunk_hold(asoc->strreset_chunk);
+       sctp_add_cmd_sf(commands, SCTP_CMD_REPLY,
+                       SCTP_CHUNK(asoc->strreset_chunk));
+       sctp_add_cmd_sf(commands, SCTP_CMD_STRIKE, SCTP_TRANSPORT(transport));
+
+       return SCTP_DISPOSITION_CONSUME;
+}
+
 /*
  * Process an heartbeat request.
  *
@@ -3237,36 +3264,34 @@ static sctp_disposition_t sctp_sf_tabort_8_4_8(struct net *net,
        struct sctp_chunk *abort;
 
        packet = sctp_ootb_pkt_new(net, asoc, chunk);
+       if (!packet)
+               return SCTP_DISPOSITION_NOMEM;
 
-       if (packet) {
-               /* Make an ABORT. The T bit will be set if the asoc
-                * is NULL.
-                */
-               abort = sctp_make_abort(asoc, chunk, 0);
-               if (!abort) {
-                       sctp_ootb_pkt_free(packet);
-                       return SCTP_DISPOSITION_NOMEM;
-               }
-
-               /* Reflect vtag if T-Bit is set */
-               if (sctp_test_T_bit(abort))
-                       packet->vtag = ntohl(chunk->sctp_hdr->vtag);
+       /* Make an ABORT. The T bit will be set if the asoc
+        * is NULL.
+        */
+       abort = sctp_make_abort(asoc, chunk, 0);
+       if (!abort) {
+               sctp_ootb_pkt_free(packet);
+               return SCTP_DISPOSITION_NOMEM;
+       }
 
-               /* Set the skb to the belonging sock for accounting.  */
-               abort->skb->sk = ep->base.sk;
+       /* Reflect vtag if T-Bit is set */
+       if (sctp_test_T_bit(abort))
+               packet->vtag = ntohl(chunk->sctp_hdr->vtag);
 
-               sctp_packet_append_chunk(packet, abort);
+       /* Set the skb to the belonging sock for accounting.  */
+       abort->skb->sk = ep->base.sk;
 
-               sctp_add_cmd_sf(commands, SCTP_CMD_SEND_PKT,
-                               SCTP_PACKET(packet));
+       sctp_packet_append_chunk(packet, abort);
 
-               SCTP_INC_STATS(net, SCTP_MIB_OUTCTRLCHUNKS);
+       sctp_add_cmd_sf(commands, SCTP_CMD_SEND_PKT,
+                       SCTP_PACKET(packet));
 
-               sctp_sf_pdiscard(net, ep, asoc, type, arg, commands);
-               return SCTP_DISPOSITION_CONSUME;
-       }
+       SCTP_INC_STATS(net, SCTP_MIB_OUTCTRLCHUNKS);
 
-       return SCTP_DISPOSITION_NOMEM;
+       sctp_sf_pdiscard(net, ep, asoc, type, arg, commands);
+       return SCTP_DISPOSITION_CONSUME;
 }
 
 /*
@@ -3503,45 +3528,43 @@ static sctp_disposition_t sctp_sf_shut_8_4_5(struct net *net,
        struct sctp_chunk *shut;
 
        packet = sctp_ootb_pkt_new(net, asoc, chunk);
+       if (!packet)
+               return SCTP_DISPOSITION_NOMEM;
 
-       if (packet) {
-               /* Make an SHUTDOWN_COMPLETE.
-                * The T bit will be set if the asoc is NULL.
-                */
-               shut = sctp_make_shutdown_complete(asoc, chunk);
-               if (!shut) {
-                       sctp_ootb_pkt_free(packet);
-                       return SCTP_DISPOSITION_NOMEM;
-               }
-
-               /* Reflect vtag if T-Bit is set */
-               if (sctp_test_T_bit(shut))
-                       packet->vtag = ntohl(chunk->sctp_hdr->vtag);
+       /* Make an SHUTDOWN_COMPLETE.
+        * The T bit will be set if the asoc is NULL.
+        */
+       shut = sctp_make_shutdown_complete(asoc, chunk);
+       if (!shut) {
+               sctp_ootb_pkt_free(packet);
+               return SCTP_DISPOSITION_NOMEM;
+       }
 
-               /* Set the skb to the belonging sock for accounting.  */
-               shut->skb->sk = ep->base.sk;
+       /* Reflect vtag if T-Bit is set */
+       if (sctp_test_T_bit(shut))
+               packet->vtag = ntohl(chunk->sctp_hdr->vtag);
 
-               sctp_packet_append_chunk(packet, shut);
+       /* Set the skb to the belonging sock for accounting.  */
+       shut->skb->sk = ep->base.sk;
 
-               sctp_add_cmd_sf(commands, SCTP_CMD_SEND_PKT,
-                               SCTP_PACKET(packet));
+       sctp_packet_append_chunk(packet, shut);
 
-               SCTP_INC_STATS(net, SCTP_MIB_OUTCTRLCHUNKS);
+       sctp_add_cmd_sf(commands, SCTP_CMD_SEND_PKT,
+                       SCTP_PACKET(packet));
 
-               /* If the chunk length is invalid, we don't want to process
-                * the reset of the packet.
-                */
-               if (!sctp_chunk_length_valid(chunk, sizeof(sctp_chunkhdr_t)))
-                       return sctp_sf_pdiscard(net, ep, asoc, type, arg, commands);
+       SCTP_INC_STATS(net, SCTP_MIB_OUTCTRLCHUNKS);
 
-               /* We need to discard the rest of the packet to prevent
-                * potential bomming attacks from additional bundled chunks.
-                * This is documented in SCTP Threats ID.
-                */
+       /* If the chunk length is invalid, we don't want to process
+        * the reset of the packet.
+        */
+       if (!sctp_chunk_length_valid(chunk, sizeof(sctp_chunkhdr_t)))
                return sctp_sf_pdiscard(net, ep, asoc, type, arg, commands);
-       }
 
-       return SCTP_DISPOSITION_NOMEM;
+       /* We need to discard the rest of the packet to prevent
+        * potential bomming attacks from additional bundled chunks.
+        * This is documented in SCTP Threats ID.
+        */
+       return sctp_sf_pdiscard(net, ep, asoc, type, arg, commands);
 }
 
 /*
@@ -3811,6 +3834,60 @@ sctp_disposition_t sctp_sf_do_asconf_ack(struct net *net,
        return SCTP_DISPOSITION_DISCARD;
 }
 
+/* RE-CONFIG Section 5.2 Upon reception of an RECONF Chunk. */
+sctp_disposition_t sctp_sf_do_reconf(struct net *net,
+                                    const struct sctp_endpoint *ep,
+                                    const struct sctp_association *asoc,
+                                    const sctp_subtype_t type, void *arg,
+                                    sctp_cmd_seq_t *commands)
+{
+       struct sctp_paramhdr *err_param = NULL;
+       struct sctp_chunk *chunk = arg;
+       struct sctp_reconf_chunk *hdr;
+       union sctp_params param;
+
+       if (!sctp_vtag_verify(chunk, asoc)) {
+               sctp_add_cmd_sf(commands, SCTP_CMD_REPORT_BAD_TAG,
+                               SCTP_NULL());
+               return sctp_sf_pdiscard(net, ep, asoc, type, arg, commands);
+       }
+
+       /* Make sure that the RECONF chunk has a valid length.  */
+       if (!sctp_chunk_length_valid(chunk, sizeof(*hdr)))
+               return sctp_sf_violation_chunklen(net, ep, asoc, type, arg,
+                                                 commands);
+
+       if (!sctp_verify_reconf(asoc, chunk, &err_param))
+               return sctp_sf_violation_paramlen(net, ep, asoc, type, arg,
+                                                 (void *)err_param, commands);
+
+       hdr = (struct sctp_reconf_chunk *)chunk->chunk_hdr;
+       sctp_walk_params(param, hdr, params) {
+               struct sctp_chunk *reply = NULL;
+               struct sctp_ulpevent *ev = NULL;
+
+               if (param.p->type == SCTP_PARAM_RESET_OUT_REQUEST)
+                       reply = sctp_process_strreset_outreq(
+                               (struct sctp_association *)asoc, param, &ev);
+               else if (param.p->type == SCTP_PARAM_RESET_IN_REQUEST)
+                       reply = sctp_process_strreset_inreq(
+                               (struct sctp_association *)asoc, param, &ev);
+               /* More handles for other types will be added here, by now it
+                * just ignores other types.
+                */
+
+               if (ev)
+                       sctp_add_cmd_sf(commands, SCTP_CMD_EVENT_ULP,
+                                       SCTP_ULPEVENT(ev));
+
+               if (reply)
+                       sctp_add_cmd_sf(commands, SCTP_CMD_REPLY,
+                                       SCTP_CHUNK(reply));
+       }
+
+       return SCTP_DISPOSITION_CONSUME;
+}
+
 /*
  * PR-SCTP Section 3.6 Receiver Side Implementation of PR-SCTP
  *
@@ -3844,6 +3921,9 @@ sctp_disposition_t sctp_sf_eat_fwd_tsn(struct net *net,
                return sctp_sf_pdiscard(net, ep, asoc, type, arg, commands);
        }
 
+       if (!asoc->peer.prsctp_capable)
+               return sctp_sf_unk_chunk(net, ep, asoc, type, arg, commands);
+
        /* Make sure that the FORWARD_TSN chunk has valid length.  */
        if (!sctp_chunk_length_valid(chunk, sizeof(struct sctp_fwdtsn_chunk)))
                return sctp_sf_violation_chunklen(net, ep, asoc, type, arg,
@@ -3912,6 +3992,9 @@ sctp_disposition_t sctp_sf_eat_fwd_tsn_fast(
                return sctp_sf_pdiscard(net, ep, asoc, type, arg, commands);
        }
 
+       if (!asoc->peer.prsctp_capable)
+               return sctp_sf_unk_chunk(net, ep, asoc, type, arg, commands);
+
        /* Make sure that the FORWARD_TSN chunk has a valid length.  */
        if (!sctp_chunk_length_valid(chunk, sizeof(struct sctp_fwdtsn_chunk)))
                return sctp_sf_violation_chunklen(net, ep, asoc, type, arg,
@@ -5162,6 +5245,19 @@ sctp_disposition_t sctp_sf_do_prm_asconf(struct net *net,
        return SCTP_DISPOSITION_CONSUME;
 }
 
+/* RE-CONFIG Section 5.1 RECONF Chunk Procedures */
+sctp_disposition_t sctp_sf_do_prm_reconf(struct net *net,
+                                        const struct sctp_endpoint *ep,
+                                        const struct sctp_association *asoc,
+                                        const sctp_subtype_t type,
+                                        void *arg, sctp_cmd_seq_t *commands)
+{
+       struct sctp_chunk *chunk = arg;
+
+       sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(chunk));
+       return SCTP_DISPOSITION_CONSUME;
+}
+
 /*
  * Ignore the primitive event
  *
@@ -6036,8 +6132,9 @@ static struct sctp_packet *sctp_ootb_pkt_new(struct net *net,
        sctp_transport_route(transport, (union sctp_addr *)&chunk->dest,
                             sctp_sk(net->sctp.ctl_sock));
 
-       packet = sctp_packet_init(&transport->packet, transport, sport, dport);
-       packet = sctp_packet_config(packet, vtag, 0);
+       packet = &transport->packet;
+       sctp_packet_init(packet, transport, sport, dport);
+       sctp_packet_config(packet, vtag, 0);
 
        return packet;
 
@@ -6278,9 +6375,8 @@ static int sctp_eat_data(const struct sctp_association *asoc,
         * and is invalid.
         */
        ssn = ntohs(data_hdr->ssn);
-       if (ordered && SSN_lt(ssn, sctp_ssn_peek(&asoc->ssnmap->in, sid))) {
+       if (ordered && SSN_lt(ssn, sctp_ssn_peek(asoc->stream, in, sid)))
                return SCTP_IERROR_PROTO_VIOLATION;
-       }
 
        /* Send the data up to the user.  Note:  Schedule  the
         * SCTP_CMD_CHUNK_ULP cmd before the SCTP_CMD_GEN_SACK, as the SACK