[dpdk-dev] [PATCH v5 2/3] ethdev: check if queue setup in queue-related APIs

[Wei Hu (Xavier)]

From: "Wei Hu (Xavier)" <xavier.hu...@huawei.com>

This patch adds checking whether the related Tx or Rx queue has been setup
in the queue-related API functions to avoid illegal address access.

Signed-off-by: Chengchang Tang <tangchengch...@huawei.com>
Signed-off-by: Wei Hu (Xavier) <xavier.hu...@huawei.com>
Signed-off-by: Chengwen Feng <fengcheng...@huawei.com>
Acked-by: Stephen Hemminger <step...@networkplumber.org>
Reviewed-by: Kalesh AP <kalesh-anakkur.pura...@broadcom.com>
---
 lib/librte_ethdev/rte_ethdev.c | 16 ++++++++++++++++
 lib/librte_ethdev/rte_ethdev.h |  3 ++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index 11e54d9..4acf858 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -890,6 +890,14 @@ eth_dev_validate_rx_queue(const struct rte_eth_dev *dev, 
uint16_t rx_queue_id)
                return -EINVAL;
        }
 
+       if (dev->data->rx_queues[rx_queue_id] == NULL) {
+               port_id = dev->data->port_id;
+               RTE_ETHDEV_LOG(ERR,
+                              "Queue %u of device with port_id=%u has not been 
setup\n",
+                              rx_queue_id, port_id);
+               return -EINVAL;
+       }
+
        return 0;
 }
 
@@ -906,6 +914,14 @@ eth_dev_validate_tx_queue(const struct rte_eth_dev *dev, 
uint16_t tx_queue_id)
                return -EINVAL;
        }
 
+       if (dev->data->tx_queues[tx_queue_id] == NULL) {
+               port_id = dev->data->port_id;
+               RTE_ETHDEV_LOG(ERR,
+                              "Queue %u of device with port_id=%u has not been 
setup\n",
+                              tx_queue_id, port_id);
+               return -EINVAL;
+       }
+
        return 0;
 }
 
diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h
index 5bcfbb8..f4cc591 100644
--- a/lib/librte_ethdev/rte_ethdev.h
+++ b/lib/librte_ethdev/rte_ethdev.h
@@ -4721,7 +4721,8 @@ rte_eth_rx_queue_count(uint16_t port_id, uint16_t 
queue_id)
        RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
        dev = &rte_eth_devices[port_id];
        RTE_FUNC_PTR_OR_ERR_RET(*dev->rx_queue_count, -ENOTSUP);
-       if (queue_id >= dev->data->nb_rx_queues)
+       if (queue_id >= dev->data->nb_rx_queues ||
+           dev->data->rx_queues[queue_id] == NULL)
                return -EINVAL;
 
        return (int)(*dev->rx_queue_count)(dev, queue_id);
-- 
2.9.5