From: Chengchang Tang <[email protected]> This patch adds checking whether the related Tx or Rx queue has been setupped in the queue-related API functions to avoid illegal address access. And validity check of the queue_id is also added in the API functions rte_eth_dev_rx_intr_enable and rte_eth_dev_rx_intr_disable.
Signed-off-by: Chengchang Tang <[email protected]> Signed-off-by: Wei Hu (Xavier) <[email protected]> Signed-off-by: Chengwen Feng <[email protected]> --- lib/librte_ethdev/rte_ethdev.c | 56 ++++++++++++++++++++++++++++++++++++++++++ lib/librte_ethdev/rte_ethdev.h | 3 ++- 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c index 892c246..31a8eb3 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -897,6 +897,13 @@ rte_eth_dev_rx_queue_start(uint16_t port_id, uint16_t rx_queue_id) return -EINVAL; } + if (dev->data->rx_queues[rx_queue_id] == NULL) { + RTE_ETHDEV_LOG(ERR, "Rx queue %"PRIu16" of device with port_id=%" + PRIu16" has not been setupped\n", + rx_queue_id, port_id); + return -EINVAL; + } + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_start, -ENOTSUP); if (rte_eth_dev_is_rx_hairpin_queue(dev, rx_queue_id)) { @@ -931,6 +938,13 @@ rte_eth_dev_rx_queue_stop(uint16_t port_id, uint16_t rx_queue_id) return -EINVAL; } + if (dev->data->rx_queues[rx_queue_id] == NULL) { + RTE_ETHDEV_LOG(ERR, "Rx queue %"PRIu16" of device with port_id=%" + PRIu16" has not been setupped\n", + rx_queue_id, port_id); + return -EINVAL; + } + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_stop, -ENOTSUP); if (rte_eth_dev_is_rx_hairpin_queue(dev, rx_queue_id)) { @@ -971,6 +985,13 @@ rte_eth_dev_tx_queue_start(uint16_t port_id, uint16_t tx_queue_id) return -EINVAL; } + if (dev->data->rx_queues[tx_queue_id] == NULL) { + RTE_ETHDEV_LOG(ERR, "Tx queue %"PRIu16" of device with port_id=%" + PRIu16" has not been setupped\n", + tx_queue_id, port_id); + return -EINVAL; + } + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_start, -ENOTSUP); if (rte_eth_dev_is_tx_hairpin_queue(dev, tx_queue_id)) { @@ -1003,6 +1024,13 @@ rte_eth_dev_tx_queue_stop(uint16_t port_id, uint16_t tx_queue_id) return -EINVAL; } + if (dev->data->rx_queues[tx_queue_id] == NULL) { + RTE_ETHDEV_LOG(ERR, "Tx queue %"PRIu16" of device with port_id=%" + PRIu16" has not been setupped\n", + tx_queue_id, port_id); + return -EINVAL; + } + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_stop, -ENOTSUP); if (rte_eth_dev_is_tx_hairpin_queue(dev, tx_queue_id)) { @@ -4463,6 +4491,20 @@ rte_eth_dev_rx_intr_enable(uint16_t port_id, dev = &rte_eth_devices[port_id]; + if (queue_id >= dev->data->nb_rx_queues) { + RTE_ETHDEV_LOG(ERR, "Invalid RX queue_id=%"PRIu16"\n", + queue_id); + return -EINVAL; + } + + if (dev->data->rx_queues[queue_id] == NULL) { + RTE_ETHDEV_LOG(ERR, + "Rx queue %"PRIu16" of device with port_id=%" + PRIu16" has not been setupped\n", + queue_id, port_id); + return -EINVAL; + } + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_intr_enable, -ENOTSUP); return eth_err(port_id, (*dev->dev_ops->rx_queue_intr_enable)(dev, queue_id)); @@ -4478,6 +4520,20 @@ rte_eth_dev_rx_intr_disable(uint16_t port_id, dev = &rte_eth_devices[port_id]; + if (queue_id >= dev->data->nb_rx_queues) { + RTE_ETHDEV_LOG(ERR, "Invalid Rx queue_id=%"PRIu16"\n", + queue_id); + return -EINVAL; + } + + if (dev->data->rx_queues[queue_id] == NULL) { + RTE_ETHDEV_LOG(ERR, + "Rx queue %"PRIu16" of device with port_id=%" + PRIu16" has not been setupped\n", + queue_id, port_id); + return -EINVAL; + } + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_intr_disable, -ENOTSUP); return eth_err(port_id, (*dev->dev_ops->rx_queue_intr_disable)(dev, queue_id)); 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
