examples/fips_validation: fix buffer overflow

[dpdk.git] / examples / ipsec-secgw / ipsec.c

diff --git a/examples/ipsec-secgw/ipsec.c b/examples/ipsec-secgw/ipsec.c
index d406571..01faa7a 100644 (file)
--- a/examples/ipsec-secgw/ipsec.c
+++ b/examples/ipsec-secgw/ipsec.c
@@ -418,6 +418,72 @@ flow_create_failure:
        return 0;
 }
 
+int
+create_ipsec_esp_flow(struct ipsec_sa *sa)
+{
+       int ret = 0;
+       struct rte_flow_error err;
+       if (sa->direction == RTE_SECURITY_IPSEC_SA_DIR_EGRESS) {
+               RTE_LOG(ERR, IPSEC,
+                       "No Flow director rule for Egress traffic\n");
+               return -1;
+       }
+       if (sa->flags == TRANSPORT) {
+               RTE_LOG(ERR, IPSEC,
+                       "No Flow director rule for transport mode\n");
+               return -1;
+       }
+       sa->action[0].type = RTE_FLOW_ACTION_TYPE_QUEUE;
+       sa->pattern[0].type = RTE_FLOW_ITEM_TYPE_ETH;
+       sa->action[0].conf = &(struct rte_flow_action_queue) {
+                               .index = sa->fdir_qid,
+       };
+       sa->attr.egress = 0;
+       sa->attr.ingress = 1;
+       if (IS_IP6(sa->flags)) {
+               sa->pattern[1].mask = &rte_flow_item_ipv6_mask;
+               sa->pattern[1].type = RTE_FLOW_ITEM_TYPE_IPV6;
+               sa->pattern[1].spec = &sa->ipv6_spec;
+               memcpy(sa->ipv6_spec.hdr.dst_addr,
+                       sa->dst.ip.ip6.ip6_b, sizeof(sa->dst.ip.ip6.ip6_b));
+               memcpy(sa->ipv6_spec.hdr.src_addr,
+                       sa->src.ip.ip6.ip6_b, sizeof(sa->src.ip.ip6.ip6_b));
+               sa->pattern[2].type = RTE_FLOW_ITEM_TYPE_ESP;
+               sa->pattern[2].spec = &sa->esp_spec;
+               sa->pattern[2].mask = &rte_flow_item_esp_mask;
+               sa->esp_spec.hdr.spi = rte_cpu_to_be_32(sa->spi);
+               sa->pattern[3].type = RTE_FLOW_ITEM_TYPE_END;
+       } else if (IS_IP4(sa->flags)) {
+               sa->pattern[1].mask = &rte_flow_item_ipv4_mask;
+               sa->pattern[1].type = RTE_FLOW_ITEM_TYPE_IPV4;
+               sa->pattern[1].spec = &sa->ipv4_spec;
+               sa->ipv4_spec.hdr.dst_addr = sa->dst.ip.ip4;
+               sa->ipv4_spec.hdr.src_addr = sa->src.ip.ip4;
+               sa->pattern[2].type = RTE_FLOW_ITEM_TYPE_ESP;
+               sa->pattern[2].spec = &sa->esp_spec;
+               sa->pattern[2].mask = &rte_flow_item_esp_mask;
+               sa->esp_spec.hdr.spi = rte_cpu_to_be_32(sa->spi);
+               sa->pattern[3].type = RTE_FLOW_ITEM_TYPE_END;
+       }
+       sa->action[1].type = RTE_FLOW_ACTION_TYPE_END;
+
+       ret = rte_flow_validate(sa->portid, &sa->attr, sa->pattern, sa->action,
+                               &err);
+       if (ret < 0) {
+               RTE_LOG(ERR, IPSEC, "Flow validation failed %s\n", err.message);
+               return ret;
+       }
+
+       sa->flow = rte_flow_create(sa->portid, &sa->attr, sa->pattern,
+                                       sa->action, &err);
+       if (!sa->flow) {
+               RTE_LOG(ERR, IPSEC, "Flow creation failed %s\n", err.message);
+               return -1;
+       }
+
+       return 0;
+}
+
 /*
  * queue crypto-ops into PMD queue.
  */
@@ -434,7 +500,7 @@ enqueue_cop_burst(struct cdev_qp *cqp)
                        cqp->id, cqp->qp, ret, len);
                        /* drop packets that we fail to enqueue */
                        for (i = ret; i < len; i++)
-                               rte_pktmbuf_free(cqp->buf[i]->sym->m_src);
+                               free_pkts(&cqp->buf[i]->sym->m_src, 1);
        }
        cqp->in_flight += ret;
        cqp->len = 0;
@@ -462,7 +528,7 @@ ipsec_enqueue(ipsec_xform_fn xform_func, struct ipsec_ctx *ipsec_ctx,
 
        for (i = 0; i < nb_pkts; i++) {
                if (unlikely(sas[i] == NULL)) {
-                       rte_pktmbuf_free(pkts[i]);
+                       free_pkts(&pkts[i], 1);
                        continue;
                }
 
@@ -483,7 +549,7 @@ ipsec_enqueue(ipsec_xform_fn xform_func, struct ipsec_ctx *ipsec_ctx,
 
                        if ((unlikely(ips->security.ses == NULL)) &&
                                create_lookaside_session(ipsec_ctx, sa, ips)) {
-                               rte_pktmbuf_free(pkts[i]);
+                               free_pkts(&pkts[i], 1);
                                continue;
                        }
 
@@ -497,7 +563,7 @@ ipsec_enqueue(ipsec_xform_fn xform_func, struct ipsec_ctx *ipsec_ctx,
                case RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO:
                        RTE_LOG(ERR, IPSEC, "CPU crypto is not supported by the"
                                        " legacy mode.");
-                       rte_pktmbuf_free(pkts[i]);
+                       free_pkts(&pkts[i], 1);
                        continue;
 
                case RTE_SECURITY_ACTION_TYPE_NONE:
@@ -509,7 +575,7 @@ ipsec_enqueue(ipsec_xform_fn xform_func, struct ipsec_ctx *ipsec_ctx,
 
                        if ((unlikely(ips->crypto.ses == NULL)) &&
                                create_lookaside_session(ipsec_ctx, sa, ips)) {
-                               rte_pktmbuf_free(pkts[i]);
+                               free_pkts(&pkts[i], 1);
                                continue;
                        }
 
@@ -518,7 +584,7 @@ ipsec_enqueue(ipsec_xform_fn xform_func, struct ipsec_ctx *ipsec_ctx,
 
                        ret = xform_func(pkts[i], sa, &priv->cop);
                        if (unlikely(ret)) {
-                               rte_pktmbuf_free(pkts[i]);
+                               free_pkts(&pkts[i], 1);
                                continue;
                        }
                        break;
@@ -542,7 +608,7 @@ ipsec_enqueue(ipsec_xform_fn xform_func, struct ipsec_ctx *ipsec_ctx,
 
                        ret = xform_func(pkts[i], sa, &priv->cop);
                        if (unlikely(ret)) {
-                               rte_pktmbuf_free(pkts[i]);
+                               free_pkts(&pkts[i], 1);
                                continue;
                        }
 
@@ -577,7 +643,7 @@ ipsec_inline_dequeue(ipsec_xform_fn xform_func, struct ipsec_ctx *ipsec_ctx,
                sa = priv->sa;
                ret = xform_func(pkt, sa, &priv->cop);
                if (unlikely(ret)) {
-                       rte_pktmbuf_free(pkt);
+                       free_pkts(&pkt, 1);
                        continue;
                }
                pkts[nb_pkts++] = pkt;
@@ -624,13 +690,13 @@ ipsec_dequeue(ipsec_xform_fn xform_func, struct ipsec_ctx *ipsec_ctx,
                                RTE_SECURITY_ACTION_TYPE_NONE) {
                                ret = xform_func(pkt, sa, cops[j]);
                                if (unlikely(ret)) {
-                                       rte_pktmbuf_free(pkt);
+                                       free_pkts(&pkt, 1);
                                        continue;
                                }
                        } else if (ipsec_get_action_type(sa) ==
                                RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL) {
                                if (cops[j]->status) {
-                                       rte_pktmbuf_free(pkt);
+                                       free_pkts(&pkt, 1);
                                        continue;
                                }
                        }