net: hns3: fix error handling int the hns3_get_vector_ring_chain
authorHuazhong Tan <tanhuazhong@huawei.com>
Tue, 18 Dec 2018 11:37:48 +0000 (19:37 +0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 18 Dec 2018 20:01:00 +0000 (12:01 -0800)
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>
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

index 69142a381064d6a630b4f921dec968905002e724..2081e2eb18fd226033ad664cd9b175bdd8326d3a 100644 (file)
@@ -2993,9 +2993,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;
 }
@@ -3086,7 +3087,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);