From 34dff8bacc7b95cc288c24894443bd356e453b64 Mon Sep 17 00:00:00 2001 From: Konstantin Ananyev Date: Thu, 23 Apr 2020 16:10:42 +0100 Subject: [PATCH] security: fix crash at accessing non-implemented ops Valid checks for optional function pointers inside dev-ops were disabled by undefined macro. Fixes: b6ee98547847 ("security: fix verification of parameters") Cc: stable@dpdk.org Signed-off-by: Konstantin Ananyev Acked-by: Akhil Goyal --- lib/librte_security/rte_security.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/librte_security/rte_security.c b/lib/librte_security/rte_security.c index d475b09771..dc9a3e89cd 100644 --- a/lib/librte_security/rte_security.c +++ b/lib/librte_security/rte_security.c @@ -108,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); } @@ -122,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; -- 2.20.1