kernel-janitors.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Catherine Sullivan <csully@google.com>
To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: Sagi Shahar <sagis@google.com>, Jon Olson <jonolson@google.com>,
	David Miller <davem@davemloft.net>,
	kuba@kernel.org, David Awogbemila <awogbemila@google.com>,
	Willem de Bruijn <willemb@google.com>,
	Yangchun Fu <yangchun@google.com>,
	Bailey Forrest <bcf@google.com>, Kuo Zhao <kuozhao@google.com>,
	netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
	kernel-janitors@vger.kernel.org
Subject: Re: [PATCH net v2 1/2] gve: Fix an error handling path in 'gve_probe()'
Date: Thu, 1 Jul 2021 13:30:57 -0700	[thread overview]
Message-ID: <CAH_-1qy5uTBMw0ExLVzdOi6GffisPVs1B5xappyu+gA4H6ZGcg@mail.gmail.com> (raw)
In-Reply-To: <f5dbb1ed01d13d4eac2b719db42cb02bf8166ceb.1625170569.git.christophe.jaillet@wanadoo.fr>

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!

  parent reply	other threads:[~2021-07-01 20:32 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-01 20:18 Christophe JAILLET
2021-07-01 20:18 ` [PATCH net v2 2/2] gve: Propagate error codes to caller Christophe JAILLET
2021-07-01 20:33   ` Catherine Sullivan
2021-07-01 20:30 ` Catherine Sullivan [this message]
2021-07-01 22:50 ` [PATCH net v2 1/2] gve: Fix an error handling path in 'gve_probe()' patchwork-bot+netdevbpf

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=CAH_-1qy5uTBMw0ExLVzdOi6GffisPVs1B5xappyu+gA4H6ZGcg@mail.gmail.com \
    --to=csully@google.com \
    --cc=awogbemila@google.com \
    --cc=bcf@google.com \
    --cc=christophe.jaillet@wanadoo.fr \
    --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 \
    --subject='Re: [PATCH net v2 1/2] gve: Fix an error handling path in '\''gve_probe()'\''' \
    /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

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).