net: hns3: fix error handling int the hns3_get_vector_ring_chain

BugLink: https://bugs.launchpad.net/bugs/1810457
When hns3_get_vector_ring_chain() failed in the
hns3_nic_init_vector_data(), it should do the error handling instead
of return directly.

Also, cur_chain should be freed instead of chain and head->next should
be set to NULL in error handling of hns3_get_vector_ring_chain.

This patch fixes them.

Fixes: 73b907a083b8 ("net: hns3: bugfix for buffer not free problem during resetting")
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit cda69d244585bc4497d3bb878c22fe2b6ad647c1)
Signed-off-by: dann frazier <dann.frazier@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index 0c32799b7d467fbbdc1c57ba57208ed1fd49bf2e..5a663cf8f0b735f1eeef1e655bc3e5d511dc5436 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -2982,9 +2982,10 @@ err_free_chain:
        cur_chain = head->next;
        while (cur_chain) {
                chain = cur_chain->next;
-               devm_kfree(&pdev->dev, chain);
+               devm_kfree(&pdev->dev, cur_chain);
                cur_chain = chain;
        }
+       head->next = NULL;
 
        return -ENOMEM;
 }
@@ -3075,7 +3076,7 @@ static int hns3_nic_init_vector_data(struct hns3_nic_priv *priv)
                ret = hns3_get_vector_ring_chain(tqp_vector,
                                                 &vector_ring_chain);
                if (ret)
-                       return ret;
+                       goto map_ring_fail;
 
                ret = h->ae_algo->ops->map_ring_to_vector(h,
                        tqp_vector->vector_irq, &vector_ring_chain);