From: Beilei Xing <beilei.x...@intel.com>

Cancel alarm if failing to allocate vports memory during adapter_ext
initialization. Otherwise, there'll be segmentation fault when fail
to initialize adapter_ext.

Fixes: b2f9d4788d5c ("common/idpf: introduce adapter init/deinit")
Cc: sta...@dpdk.org

Signed-off-by: Beilei Xing <beilei.x...@intel.com>
---

v2 change:
 - Refine error code.

 drivers/net/idpf/idpf_ethdev.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/idpf/idpf_ethdev.c b/drivers/net/idpf/idpf_ethdev.c
index 46aec6ae37..e02ec2ec5a 100644
--- a/drivers/net/idpf/idpf_ethdev.c
+++ b/drivers/net/idpf/idpf_ethdev.c
@@ -1161,7 +1161,7 @@ idpf_adapter_ext_init(struct rte_pci_device *pci_dev, 
struct idpf_adapter_ext *a
        if (adapter->vports == NULL) {
                PMD_INIT_LOG(ERR, "Failed to allocate vports memory");
                ret = -ENOMEM;
-               goto err_get_ptype;
+               goto err_vports_alloc;
        }
 
        adapter->cur_vports = 0;
@@ -1171,7 +1171,8 @@ idpf_adapter_ext_init(struct rte_pci_device *pci_dev, 
struct idpf_adapter_ext *a
 
        return ret;
 
-err_get_ptype:
+err_vports_alloc:
+       rte_eal_alarm_cancel(idpf_dev_alarm_handler, adapter);
        idpf_adapter_deinit(base);
 err_adapter_init:
        return ret;
-- 
2.26.2

Reply via email to