提交 446bcad5 编写于 作者: C Christophe JAILLET 提交者: Zheng Zengkai

gve: Fix an error handling path in 'gve_probe()'

stable inclusion
from stable-5.10.54
commit 78e4baff950d9fc78752f028200f501897ff84a7
bugzilla: 175586 https://gitee.com/openeuler/kernel/issues/I4DVDU

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=78e4baff950d9fc78752f028200f501897ff84a7

--------------------------------

[ Upstream commit 2342ae10 ]

If the 'register_netdev() call fails, we must release the resources
allocated by the previous 'gve_init_priv()' call, as already done in the
remove function.

Add a new label and the missing 'gve_teardown_priv_resources()' in the
error handling path.

Fixes: 893ce44d ("gve: Add basic driver framework for Compute Engine Virtual NIC")
Signed-off-by: NChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: NCatherine Sullivan <csully@google.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NWeilong Chen <chenweilong@huawei.com>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 f8adfe43
...@@ -1340,13 +1340,16 @@ static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -1340,13 +1340,16 @@ static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
err = register_netdev(dev); err = register_netdev(dev);
if (err) if (err)
goto abort_with_wq; goto abort_with_gve_init;
dev_info(&pdev->dev, "GVE version %s\n", gve_version_str); dev_info(&pdev->dev, "GVE version %s\n", gve_version_str);
gve_clear_probe_in_progress(priv); gve_clear_probe_in_progress(priv);
queue_work(priv->gve_wq, &priv->service_task); queue_work(priv->gve_wq, &priv->service_task);
return 0; return 0;
abort_with_gve_init:
gve_teardown_priv_resources(priv);
abort_with_wq: abort_with_wq:
destroy_workqueue(priv->gve_wq); destroy_workqueue(priv->gve_wq);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册