net/iavf: fix Rx queue IRQ resource leak

In the iavf_config_rx_queues_irqs function, the memory pointed to by the
intr_handle->intr_vec and qv_map addresses is not released in the
subsequent hook branch, resulting in resource leakage.

Fixes: f593944fc988 ("net/iavf: enable IRQ mapping configuration for large VF")
Cc: stable@dpdk.org
Signed-off-by: Qiming Chen <chenqiming_huawei@163.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>

diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index c004e72..5a5a7f5 100644 (file)
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -676,7 +676,7 @@ static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev,
        if (!qv_map) {
                PMD_DRV_LOG(ERR, "Failed to allocate %d queue-vector map",
                                dev->data->nb_rx_queues);
-               return -1;
+               goto qv_map_alloc_err;
        }
 
        if (!dev->data->dev_conf.intr_conf.rxq ||
@@ -761,7 +761,7 @@ static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev,
        if (!vf->lv_enabled) {
                if (iavf_config_irq_map(adapter)) {
                        PMD_DRV_LOG(ERR, "config interrupt mapping failed");
-                       return -1;
+                       goto config_irq_map_err;
                }
        } else {
                uint16_t num_qv_maps = dev->data->nb_rx_queues;
@@ -771,7 +771,7 @@ static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev,
                        if (iavf_config_irq_map_lv(adapter,
                                        IAVF_IRQ_MAP_NUM_PER_BUF, index)) {
                                PMD_DRV_LOG(ERR, "config interrupt mapping for large VF failed");
-                               return -1;
+                               goto config_irq_map_err;
                        }
                        num_qv_maps -= IAVF_IRQ_MAP_NUM_PER_BUF;
                        index += IAVF_IRQ_MAP_NUM_PER_BUF;
@@ -779,10 +779,20 @@ static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev,
 
                if (iavf_config_irq_map_lv(adapter, num_qv_maps, index)) {
                        PMD_DRV_LOG(ERR, "config interrupt mapping for large VF failed");
-                       return -1;
+                       goto config_irq_map_err;
                }
        }
        return 0;
+
+config_irq_map_err:
+       rte_free(vf->qv_map);
+       vf->qv_map = NULL;
+
+qv_map_alloc_err:
+       rte_free(intr_handle->intr_vec);
+       intr_handle->intr_vec = NULL;
+
+       return -1;
 }
 
 static int