Skip to contentSkip to conversation

net/mlx5: fix invalid Rx/Tx queue checks

PATCH Applied Dmitry Kozlyuk 2 participants 2 messages Jul 20, 2021 – Jul 22, 2021 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/mlx5: fix invalid Rx/Tx queue checks

When device configuration was interrupted by a signal, mlx5_rxq/txq_release() could access yet unitinialized array and crash the application. Add checks whether queue array is initialized.

Fixes a1366b1a2be3 ("net/mlx5: add reference counter on DPDK Rx queues")
Fixes 6e78005a9b30 ("net/mlx5: add reference counter on DPDK Tx queues")
---
 drivers/net/mlx5/mlx5_rxq.c | 2 +-
 drivers/net/mlx5/mlx5_txq.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/mlx5/mlx5_rxq.c +1 -1
index 23685d7654..afe77e612d 100644
@@ -1712,7 +1712,7 @@ mlx5_rxq_release(struct rte_eth_dev *dev, uint16_t idx)
 	struct mlx5_priv *priv = dev->data->dev_private;
 	struct mlx5_rxq_ctrl *rxq_ctrl;
 
-	if (!(*priv->rxqs)[idx])
+	if (priv->rxqs == NULL || (*priv->rxqs)[idx] == NULL)
 		return 0;
 	rxq_ctrl = container_of((*priv->rxqs)[idx], struct mlx5_rxq_ctrl, rxq);
 	if (__atomic_sub_fetch(&rxq_ctrl->refcnt, 1, __ATOMIC_RELAXED) > 1)
drivers/net/mlx5/mlx5_txq.c +1 -1
index 3e5e94444b..d3b9de7c7a 100644
@@ -1246,7 +1246,7 @@ mlx5_txq_release(struct rte_eth_dev *dev, uint16_t idx)
 	struct mlx5_priv *priv = dev->data->dev_private;
 	struct mlx5_txq_ctrl *txq_ctrl;
 
-	if (!(*priv->txqs)[idx])
+	if (priv->txqs == NULL || (*priv->txqs)[idx] == NULL)
 		return 0;
 	txq_ctrl = container_of((*priv->txqs)[idx], struct mlx5_txq_ctrl, txq);
 	if (__atomic_sub_fetch(&txq_ctrl->refcnt, 1, __ATOMIC_RELAXED) > 1)
Signature · 1 line
2.25.1
#1 lore raw

20/07/2021 09:53, Dmitry Kozlyuk:

Quoted 11 lines

When device configuration was interrupted by a signal, mlx5_rxq/txq_release() could access yet unitinialized array and crash the application. Add checks whether queue array is initialized.

Fixes a1366b1a2be3 ("net/mlx5: add reference counter on DPDK Rx queues")
Fixes 6e78005a9b30 ("net/mlx5: add reference counter on DPDK Tx queues")

Applied, thanks.

PS: no need fo "invalid" word after "fix".