gve: Fix an error handling path in 'gve_probe()'
[ Upstream commit2342ae10d1
] 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:893ce44df5
("gve: Add basic driver framework for Compute Engine Virtual NIC") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Catherine Sullivan <csully@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
813449fb85
commit
78e4baff95
@ -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);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user