Skip to contentSkip to conversation

Patch "net: hns3: fix error handling int the hns3_get_vector_ring_chain" has been added to the 4.19-stable tree

DISCUSSION Greg KH 1 participant 1 message Nov 28, 2019 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Greg KH

author
#1 lore raw
Quoted 56 lines · Sasha Levin

This is a note to let you know that I've just added the patch titled

net: hns3: fix error handling int the hns3_get_vector_ring_chain

to the 4.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
net-hns3-fix-error-handling-int-the-hns3_get_vector_.patch
and it can be found in the queue-4.19 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

commit 4b01732de5278618d8b013fa300638742392d507

Author: Huazhong Tan <[email protected]>
Date:   Tue Dec 18 19:37:48 2018 +0800

net: hns3: fix error handling int the hns3_get_vector_ring_chain

[ Upstream commit cda69d244585bc4497d3bb878c22fe2b6ad647c1 ]

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")
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +2 -1
index 3708f149d0a6a..2f1c4adf1734d 100644
@@ -2597,9 +2597,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;
 }

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c static int hns3_nic_init_vector_data(struct hns3_nic_priv *priv) · line 2678

Quoted 8 lines
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +1 -1
@@ -2671,7 +2672,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);

This breaks the build:
../drivers/net/ethernet/hisilicon/hns3/hns3_enet.c: In function ‘hns3_nic_init_vector_data’:
../drivers/net/ethernet/hisilicon/hns3/hns3_enet.c:2675:4: error: label ‘map_ring_fail’ used but not defined

 2675 |    goto map_ring_fail;
      |    ^~~~

So I'm going to drop it from the tree.

thanks,

greg k-h