Skip to contentSkip to conversation

raw/ioat: fix kvlist free

PATCH Applied Kevin Laatz 2 participants 2 messages Oct 14, 2020 – Oct 19, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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")
---
 drivers/raw/ioat/idxd_vdev.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/raw/ioat/idxd_vdev.c +6 -8
index 50d47d05c5..30a53b3b82 100644
@@ -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
Signature · 1 line
2.25.1
#1 lore raw

14/10/2020 12:09, Kevin Laatz:

Quoted 11 lines

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")

Applied, thanks