patch 'common/mlx5: fix missing validation in devargs parsing' has been queued to stable release 21.11.1

Kevin Traynor ktraynor at redhat.com
Mon Feb 21 16:33:52 CET 2022


Hi,

FYI, your patch has been queued to stable release 21.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/26/22. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/59f8d27b5f1522e88bae41e5d3d36cadeb5a9d20

Thanks.

Kevin

---
>From 59f8d27b5f1522e88bae41e5d3d36cadeb5a9d20 Mon Sep 17 00:00:00 2001
From: Michael Baum <michaelba at nvidia.com>
Date: Thu, 16 Dec 2021 20:40:40 +0200
Subject: [PATCH] common/mlx5: fix missing validation in devargs parsing

[ upstream commit a1d59091a6b56ea8f22a9954b71070533d26d63a ]

The rte_kvargs_parse function parses the arguments
"key=value,key=value,..." string and return an allocated structure that
contains a key/value list.
It enables also to send a key without value and updates the values in
the following ways:
 - "key=value,key,..." - value is updated as NULL.
 - "key=value,key=,..." - value is updated as "" (empty string).

Mlx5 PMDs use this function to parse, but they don't support key without
value. They send the value as an argument to strtol function.
When strtol gets NULL as a parameter it cause a crash, when it gets ""
(empty string) it returns 0.

Adds a check that will prevent an argument in these formats, and returns
an error for it.

Fixes: 85209924039c ("common/mlx5: share memory related devargs")

Signed-off-by: Michael Baum <michaelba at nvidia.com>
Acked-by: Matan Azrad <matan at nvidia.com>
---
 drivers/common/mlx5/mlx5_common.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/common/mlx5/mlx5_common.c b/drivers/common/mlx5/mlx5_common.c
index 22ff273819..185db4d004 100644
--- a/drivers/common/mlx5/mlx5_common.c
+++ b/drivers/common/mlx5/mlx5_common.c
@@ -112,4 +112,9 @@ mlx5_common_args_check_handler(const char *key, const char *val, void *opaque)
 	signed long tmp;
 
+	if (val == NULL || *val == '\0') {
+		DRV_LOG(ERR, "Key %s is missing value.", key);
+		rte_errno = EINVAL;
+		return -rte_errno;
+	}
 	errno = 0;
 	tmp = strtol(val, NULL, 0);
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-02-21 15:22:45.578298081 +0000
+++ 0043-common-mlx5-fix-missing-validation-in-devargs-parsin.patch	2022-02-21 15:22:44.087704116 +0000
@@ -1 +1 @@
-From a1d59091a6b56ea8f22a9954b71070533d26d63a Mon Sep 17 00:00:00 2001
+From 59f8d27b5f1522e88bae41e5d3d36cadeb5a9d20 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a1d59091a6b56ea8f22a9954b71070533d26d63a ]
+
@@ -23 +24,0 @@
-Cc: stable at dpdk.org



More information about the stable mailing list