examples/fips_validation: fix buffer overflow

[dpdk.git] / lib / librte_security / rte_security.c

diff --git a/lib/librte_security/rte_security.c b/lib/librte_security/rte_security.c
index 38ccc2e..515c29e 100644 (file)
--- a/lib/librte_security/rte_security.c
+++ b/lib/librte_security/rte_security.c
@@ -90,14 +90,16 @@ rte_security_session_destroy(struct rte_security_ctx *instance,
                        -ENOTSUP);
        RTE_PTR_OR_ERR_RET(sess, -EINVAL);
 
+       ret = instance->ops->session_destroy(instance->device, sess);
+       if (ret != 0)
+               return ret;
+
+       rte_mempool_put(rte_mempool_from_obj(sess), (void *)sess);
+
        if (instance->sess_cnt)
                instance->sess_cnt--;
 
-       ret = instance->ops->session_destroy(instance->device, sess);
-       if (!ret)
-               rte_mempool_put(rte_mempool_from_obj(sess), (void *)sess);
-
-       return ret;
+       return 0;
 }
 
 int
@@ -106,10 +108,11 @@ rte_security_set_pkt_metadata(struct rte_security_ctx *instance,
                              struct rte_mbuf *m, void *params)
 {
 #ifdef RTE_DEBUG
-       RTE_PTR_CHAIN3_OR_ERR_RET(instance, ops, set_pkt_metadata, -EINVAL,
-                       -ENOTSUP);
        RTE_PTR_OR_ERR_RET(sess, -EINVAL);
+       RTE_PTR_OR_ERR_RET(instance, -EINVAL);
+       RTE_PTR_OR_ERR_RET(instance->ops, -EINVAL);
 #endif
+       RTE_FUNC_PTR_OR_ERR_RET(*instance->ops->set_pkt_metadata, -ENOTSUP);
        return instance->ops->set_pkt_metadata(instance->device,
                                               sess, m, params);
 }
@@ -120,8 +123,10 @@ rte_security_get_userdata(struct rte_security_ctx *instance, uint64_t md)
        void *userdata = NULL;
 
 #ifdef RTE_DEBUG
-       RTE_PTR_CHAIN3_OR_ERR_RET(instance, ops, get_userdata, NULL, NULL);
+       RTE_PTR_OR_ERR_RET(instance, NULL);
+       RTE_PTR_OR_ERR_RET(instance->ops, NULL);
 #endif
+       RTE_FUNC_PTR_OR_ERR_RET(*instance->ops->get_userdata, NULL);
        if (instance->ops->get_userdata(instance->device, md, &userdata))
                return NULL;
 
@@ -168,6 +173,11 @@ rte_security_capability_get(struct rte_security_ctx *instance,
                                if (capability->pdcp.domain ==
                                                        idx->pdcp.domain)
                                        return capability;
+                       } else if (idx->protocol ==
+                                               RTE_SECURITY_PROTOCOL_DOCSIS) {
+                               if (capability->docsis.direction ==
+                                                       idx->docsis.direction)
+                                       return capability;
                        }
                }
        }