UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: hns3: fix error handling int the hns3_get_vector_ring_chain 

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: 73b907a083 ("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>
This commit is contained in:
Huazhong Tan 2018-12-18 19:37:48 +08:00 committed by David S. Miller
parent 77c7a7b3e7
commit cda69d2445
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
View File

@ -2993,9 +2993,10 @@ err_free_chain:
cur_chain = head->next; cur_chain = head->next;
while (cur_chain) { while (cur_chain) {
chain = cur_chain->next; chain = cur_chain->next;
devm_kfree(&pdev->dev, chain); devm_kfree(&pdev->dev, cur_chain);
cur_chain = chain; cur_chain = chain;
} }
head->next = NULL;
return -ENOMEM; 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, ret = hns3_get_vector_ring_chain(tqp_vector,
&vector_ring_chain); &vector_ring_chain);
if (ret) if (ret)
return ret; goto map_ring_fail;
ret = h->ae_algo->ops->map_ring_to_vector(h, ret = h->ae_algo->ops->map_ring_to_vector(h,
tqp_vector->vector_irq, &vector_ring_chain); tqp_vector->vector_irq, &vector_ring_chain);