From 894080cf8ae4e84d3e078bca8768437f520f715e Mon Sep 17 00:00:00 2001 From: Kevin Laatz Date: Wed, 14 Oct 2020 11:09:48 +0100 Subject: [PATCH] raw/ioat: fix kvlist free There is a null pointer check in 'idxd_vdev_parse_params()' which is causing a coverity issue. This check is redundant as the same check is being done in 'rte_kvargs_free()', so it is simply removed in this patch. In addition, kvlist was only being free'd on one path in this function. This is fixed by always free'ing kvlist before returning. Coverity issue: 363049 Fixes: 777edf43ae4f ("raw/ioat: introduce vdev probe for DSA/idxd device") Signed-off-by: Kevin Laatz --- drivers/raw/ioat/idxd_vdev.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/raw/ioat/idxd_vdev.c b/drivers/raw/ioat/idxd_vdev.c index 50d47d05c5..30a53b3b82 100644 --- a/drivers/raw/ioat/idxd_vdev.c +++ b/drivers/raw/ioat/idxd_vdev.c @@ -93,23 +93,21 @@ idxd_rawdev_parse_wq(const char *key __rte_unused, const char *value, static int idxd_vdev_parse_params(struct rte_kvargs *kvlist, struct idxd_vdev_args *args) { + int ret = 0; + if (rte_kvargs_count(kvlist, IDXD_ARG_WQ) == 1) { if (rte_kvargs_process(kvlist, IDXD_ARG_WQ, &idxd_rawdev_parse_wq, args) < 0) { IOAT_PMD_ERR("Error parsing %s", IDXD_ARG_WQ); - goto free; + ret = -EINVAL; } } else { IOAT_PMD_ERR("%s is a mandatory arg", IDXD_ARG_WQ); - return -EINVAL; + ret = -EINVAL; } - return 0; - -free: - if (kvlist) - rte_kvargs_free(kvlist); - return -EINVAL; + rte_kvargs_free(kvlist); + return ret; } static int -- 2.20.1