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: 2d823ecd671c ("net/cpfl: support device initialization")

Signed-off-by: Beilei Xing <beilei.x...@intel.com>
---
 drivers/net/cpfl/cpfl_ethdev.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/cpfl/cpfl_ethdev.c b/drivers/net/cpfl/cpfl_ethdev.c
index 54261d5743..ede730fd50 100644
--- a/drivers/net/cpfl/cpfl_ethdev.c
+++ b/drivers/net/cpfl/cpfl_ethdev.c
@@ -1199,7 +1199,7 @@ cpfl_adapter_ext_init(struct rte_pci_device *pci_dev, 
struct cpfl_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;
@@ -1209,7 +1209,8 @@ cpfl_adapter_ext_init(struct rte_pci_device *pci_dev, 
struct cpfl_adapter_ext *a
 
        return ret;
 
-err_get_ptype:
+err_vports_alloc:
+       rte_eal_alarm_cancel(cpfl_dev_alarm_handler, adapter);
        idpf_adapter_deinit(base);
 err_adapter_init:
        return ret;
-- 
2.26.2

Reply via email to