| Message ID | f5dbb1ed01d13d4eac2b719db42cb02bf8166ceb.1625170569.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 2342ae10d1272d411a468a85a67647dd115b344f |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,v2,1/2] gve: Fix an error handling path in 'gve_probe()' | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | fail | 1 blamed authors not CCed: lrizzo@google.com; 2 maintainers not CCed: patricion@google.com lrizzo@google.com |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 17 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
On Thu, Jul 1, 2021 at 1:18 PM Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote: > > 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: 893ce44df565 ("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> > --- > v2: Fix a typo in the label name > The previous serie had 3 patches. Now their are only 2 > --- > drivers/net/ethernet/google/gve/gve_main.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c > index 867e87af3432..44262c9f9ec2 100644 > --- a/drivers/net/ethernet/google/gve/gve_main.c > +++ b/drivers/net/ethernet/google/gve/gve_main.c > @@ -1565,7 +1565,7 @@ static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent) > > err = register_netdev(dev); > 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 queue format %d\n", (int)priv->queue_format); > @@ -1573,6 +1573,9 @@ static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent) > queue_work(priv->gve_wq, &priv->service_task); > return 0; > > +abort_with_gve_init: > + gve_teardown_priv_resources(priv); > + > abort_with_wq: > destroy_workqueue(priv->gve_wq); > > -- > 2.30.2 > Thanks for the fix!
Hello: This series was applied to netdev/net.git (refs/heads/master): On Thu, 1 Jul 2021 22:18:24 +0200 you wrote: > 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. > > [...] Here is the summary with links: - [net,v2,1/2] gve: Fix an error handling path in 'gve_probe()' https://git.kernel.org/netdev/net/c/2342ae10d127 - [net,v2,2/2] gve: Propagate error codes to caller https://git.kernel.org/netdev/net/c/6dce38b4b7ff You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c index 867e87af3432..44262c9f9ec2 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -1565,7 +1565,7 @@ static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent) err = register_netdev(dev); 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 queue format %d\n", (int)priv->queue_format); @@ -1573,6 +1573,9 @@ static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent) queue_work(priv->gve_wq, &priv->service_task); return 0; +abort_with_gve_init: + gve_teardown_priv_resources(priv); + abort_with_wq: destroy_workqueue(priv->gve_wq);
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: 893ce44df565 ("gve: Add basic driver framework for Compute Engine Virtual NIC") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- v2: Fix a typo in the label name The previous serie had 3 patches. Now their are only 2 --- drivers/net/ethernet/google/gve/gve_main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)