patch 'net/mlx5: fix null check in devargs parsing' has been queued to stable release 21.11.3

Kevin Traynor ktraynor at redhat.com
Fri Nov 11 11:33:10 CET 2022


Hi,

FYI, your patch has been queued to stable release 21.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/14/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/1b71989e069ef1d72d9b947e28a3833257db7aff

Thanks.

Kevin

---
>From 1b71989e069ef1d72d9b947e28a3833257db7aff Mon Sep 17 00:00:00 2001
From: Michael Baum <michaelba at nvidia.com>
Date: Mon, 24 Oct 2022 15:33:35 +0300
Subject: [PATCH] net/mlx5: fix null check in devargs parsing

[ upstream commit c2e3b84ec80d90e93a83e26ccc8c4fb750bb2d03 ]

The "mlx5_os_parse_eth_devargs()" function parses the ETH devargs into a
specific structure called "eth_da".
It gets structure called "devargs" as a member of EAL device containing
the relevant information.

When "devargs" structure is invalid, the function avoids parsing it.
However, when it valid but its field "args" is invalid, the function
tries to parse it and dereference to NULL pointer.

This patch adds check to avoid this NULL dereferencing.

Fixes: 919488fbfa71 ("net/mlx5: support Sub-Function")

Signed-off-by: Michael Baum <michaelba at nvidia.com>
Acked-by: Matan Azrad <matan at nvidia.com>
---
 drivers/net/mlx5/linux/mlx5_os.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 27d6fe644d..4197ec424e 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -2575,5 +2575,5 @@ mlx5_os_parse_eth_devargs(struct rte_device *dev,
 		return -rte_errno;
 	}
-	if (eth_da->type == RTE_ETH_REPRESENTOR_NONE) {
+	if (eth_da->type == RTE_ETH_REPRESENTOR_NONE && dev->devargs->args) {
 		/* Parse legacy device argument */
 		ret = rte_eth_devargs_parse(dev->devargs->args, eth_da);
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-11 10:32:17.581524996 +0000
+++ 0020-net-mlx5-fix-null-check-in-devargs-parsing.patch	2022-11-11 10:32:17.073300764 +0000
@@ -1 +1 @@
-From c2e3b84ec80d90e93a83e26ccc8c4fb750bb2d03 Mon Sep 17 00:00:00 2001
+From 1b71989e069ef1d72d9b947e28a3833257db7aff Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c2e3b84ec80d90e93a83e26ccc8c4fb750bb2d03 ]
+
@@ -18 +19,0 @@
-Cc: stable at dpdk.org
@@ -27 +28 @@
-index ab7ffa0931..2b6741396d 100644
+index 27d6fe644d..4197ec424e 100644
@@ -30 +31 @@
-@@ -2412,5 +2412,5 @@ mlx5_os_parse_eth_devargs(struct rte_device *dev,
+@@ -2575,5 +2575,5 @@ mlx5_os_parse_eth_devargs(struct rte_device *dev,



More information about the stable mailing list