[dpdk-stable] patch 'net/mlx5: fix missing validation of null pointer' has been queued to LTS release 18.11.3

Kevin Traynor ktraynor at redhat.com
Fri Jun 21 18:45:51 CEST 2019


Hi,

FYI, your patch has been queued to LTS release 18.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 06/26/19. 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-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/6b72bfde575ed07f419de17c3c037dc9a6bcbcbf

Thanks.

Kevin Traynor

---
>From 6b72bfde575ed07f419de17c3c037dc9a6bcbcbf Mon Sep 17 00:00:00 2001
From: Dekel Peled <dekelp at mellanox.com>
Date: Wed, 8 May 2019 11:29:39 +0300
Subject: [PATCH] net/mlx5: fix missing validation of null pointer

[ upstream commit 3a3d398280bb5113caa5aa6ada6704792ea88c36 ]

Function mlx5_rxq_ibv_release() is called in several places.
Before each call except one, the input parameter is validated to make
sure it is not null.

This patch adds the validation where it is missing.
It also changes a priv_ prefix, left in a comment, to mlx5_ prefix.

Fixes: af4f09f28294 ("net/mlx5: prefix all functions with mlx5")

Signed-off-by: Dekel Peled <dekelp at mellanox.com>
Acked-by: Shahaf Shuler <shahafs at mellanox.com>
Acked-by: Yongseok Koh <yskoh at mellanox.com>
---
 drivers/net/mlx5/mlx5_rxq.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index f1ce31703..9f1a6ea1a 100644
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -612,9 +612,10 @@ mlx5_rx_intr_vec_disable(struct rte_eth_dev *dev)
 		/**
 		 * Need to access directly the queue to release the reference
-		 * kept in priv_rx_intr_vec_enable().
+		 * kept in mlx5_rx_intr_vec_enable().
 		 */
 		rxq_data = (*priv->rxqs)[i];
 		rxq_ctrl = container_of(rxq_data, struct mlx5_rxq_ctrl, rxq);
-		mlx5_rxq_ibv_release(rxq_ctrl->ibv);
+		if (rxq_ctrl->ibv)
+			mlx5_rxq_ibv_release(rxq_ctrl->ibv);
 	}
 free:
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-06-21 17:22:12.116754341 +0100
+++ 0007-net-mlx5-fix-missing-validation-of-null-pointer.patch	2019-06-21 17:22:11.716519285 +0100
@@ -1 +1 @@
-From 3a3d398280bb5113caa5aa6ada6704792ea88c36 Mon Sep 17 00:00:00 2001
+From 6b72bfde575ed07f419de17c3c037dc9a6bcbcbf Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3a3d398280bb5113caa5aa6ada6704792ea88c36 ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index 83ba525e6..f595e7a52 100644
+index f1ce31703..9f1a6ea1a 100644
@@ -27 +28 @@
-@@ -594,9 +594,10 @@ mlx5_rx_intr_vec_disable(struct rte_eth_dev *dev)
+@@ -612,9 +612,10 @@ mlx5_rx_intr_vec_disable(struct rte_eth_dev *dev)


More information about the stable mailing list