1. Accurately check the return status of rte_intr_callback_unregister_sync 2. Add sanity checks of ring pointer on IO queue release
Signed-off-by: Amit Bernstein <[email protected]> Signed-off-by: Shai Brandes <[email protected]> Reviewed-by: Yosef Raisman <[email protected]> --- drivers/net/ena/ena_ethdev.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index a2863f1e22..568aca1152 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -939,8 +939,8 @@ static int ena_close(struct rte_eth_dev *dev) if (!adapter->control_path_poll_interval) { rte_intr_disable(intr_handle); rc = rte_intr_callback_unregister_sync(intr_handle, ena_control_path_handler, dev); - if (unlikely(rc != 0)) - PMD_INIT_LOG_LINE(ERR, "Failed to unregister interrupt handler"); + if (unlikely(rc < 0)) + PMD_INIT_LOG_LINE(ERR, "Failed to unregister interrupt handler (%d)", rc); } else { rte_eal_alarm_cancel(ena_control_path_poll_handler, dev); } @@ -1020,6 +1020,9 @@ static void ena_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid) { struct ena_ring *ring = dev->data->rx_queues[qid]; + if (!ring) + return; + /* Free ring resources */ rte_free(ring->rx_buffer_info); ring->rx_buffer_info = NULL; @@ -1040,6 +1043,9 @@ static void ena_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid) { struct ena_ring *ring = dev->data->tx_queues[qid]; + if (!ring) + return; + /* Free ring resources */ rte_free(ring->push_buf_intermediate_buf); -- 2.17.1
