From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
To: csully@google.com, sagis@google.com, jonolson@google.com,
davem@davemloft.net, kuba@kernel.org, awogbemila@google.com,
willemb@google.com, yangchun@google.com, bcf@google.com,
kuozhao@google.com
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-janitors@vger.kernel.org,
Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Subject: [PATCH 1/3] gve: Fix an error handling path in 'gve_probe()'
Date: Thu, 1 Jul 2021 07:58:40 +0200 [thread overview]
Message-ID: <25de65aff4df2f0f0a67dd81b34be59b018e34c9.1625118581.git.christophe.jaillet@wanadoo.fr> (raw)
In-Reply-To: <cover.1625118581.git.christophe.jaillet@wanadoo.fr>
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>
---
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..32166ebc0f01 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_vge_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_vge_init:
+ gve_teardown_priv_resources(priv);
+
abort_with_wq:
destroy_workqueue(priv->gve_wq);
--
2.30.2
next prev parent reply other threads:[~2021-07-01 5:58 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-01 5:58 [PATCH 0/3] gve: Fixes and clean-up Christophe JAILLET
2021-07-01 5:58 ` Christophe JAILLET [this message]
2021-07-01 5:58 ` [PATCH 2/3] gve: Propagate error codes to caller Christophe JAILLET
2021-07-01 5:58 ` [PATCH 3/3] gve: Simplify code and axe the use of a deprecated API Christophe JAILLET
2021-07-01 16:20 ` [PATCH 0/3] gve: Fixes and clean-up Jeroen de Borst
2021-07-01 17:42 ` Christophe JAILLET
2021-07-01 18:11 ` Jeroen de Borst
2021-07-02 8:33 ` Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=25de65aff4df2f0f0a67dd81b34be59b018e34c9.1625118581.git.christophe.jaillet@wanadoo.fr \
--to=christophe.jaillet@wanadoo.fr \
--cc=awogbemila@google.com \
--cc=bcf@google.com \
--cc=csully@google.com \
--cc=davem@davemloft.net \
--cc=jonolson@google.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=kuba@kernel.org \
--cc=kuozhao@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sagis@google.com \
--cc=willemb@google.com \
--cc=yangchun@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).