From: Dan Carpenter <dan.carpenter@linaro.org>
To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: andy@greyhouse.net, davem@davemloft.net, edumazet@google.com,
kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH net 2/2] net: tehuti: Fix leaks in the error handling path of bdx_probe()
Date: Wed, 28 Feb 2024 13:17:17 +0300 [thread overview]
Message-ID: <3b12e1e2-4859-40b6-8d9d-0a940251bed4@moroto.mountain> (raw)
In-Reply-To: <9090b599c7574892b77a9521e3ddb3a52a154205.1709066709.git.christophe.jaillet@wanadoo.fr>
On Tue, Feb 27, 2024 at 09:50:56PM +0100, Christophe JAILLET wrote:
> If an error occurs when allocating the net_device, all the one already
> allocated and registered should be released, as already done in the remove
> function.
>
> Add a new label, remove the now useless 'err_out_disable_msi' label and
> adjust the error handling path accordingly.
>
> Fixes: 1a348ccc1047 ("[NET]: Add Tehuti network driver.")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> Compile tested only.
> ---
> drivers/net/ethernet/tehuti/tehuti.c | 15 ++++++++++-----
> 1 file changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/ethernet/tehuti/tehuti.c b/drivers/net/ethernet/tehuti/tehuti.c
> index 938a5caf5a3b..6678179885cb 100644
> --- a/drivers/net/ethernet/tehuti/tehuti.c
> +++ b/drivers/net/ethernet/tehuti/tehuti.c
> @@ -1965,7 +1965,7 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> ndev = alloc_etherdev(sizeof(struct bdx_priv));
> if (!ndev) {
> err = -ENOMEM;
> - goto err_out_disable_msi;
> + goto err_out_free;
> }
>
> ndev->netdev_ops = &bdx_netdev_ops;
> @@ -2031,13 +2031,13 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> if (bdx_read_mac(priv)) {
> pr_err("load MAC address failed\n");
> err = -EFAULT;
> - goto err_out_disable_msi;
> + goto err_out_free_current;
> }
> SET_NETDEV_DEV(ndev, &pdev->dev);
> err = register_netdev(ndev);
> if (err) {
> pr_err("register_netdev failed\n");
> - goto err_out_free;
> + goto err_out_free_current;
> }
> netif_carrier_off(ndev);
> netif_stop_queue(ndev);
> @@ -2046,9 +2046,14 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> }
> RET(0);
>
> -err_out_free:
> +err_out_free_current:
> free_netdev(ndev);
Since it seems like you're going to be resending this patch, could you
do this free_netdev() before gotos? That way if someone adds more code
after the loop then we can still use the goto ladder to unwind. (No one
is going to add more code after the loop, I know... I wouldn't have
commented except that it seemed like you were going to resend.)
if (bdx_read_mac(priv)) {
free_netdev(ndev);
pr_err("load MAC address failed\n");
err = -EFAULT;
goto err_out_free;
}
regards,
dan carpenter
next prev parent reply other threads:[~2024-02-28 10:17 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-27 20:50 [PATCH net 0/2] net: tehuti: Fix some error handling paths in bdx_probe() Christophe JAILLET
2024-02-27 20:50 ` [PATCH net 1/2] net: tehuti: Fix a missing pci_disable_msi() in the error handling path of bdx_probe() Christophe JAILLET
2024-02-28 9:51 ` Jiri Pirko
2024-02-28 17:52 ` Christophe JAILLET
2024-02-27 20:50 ` [PATCH net 2/2] net: tehuti: Fix leaks " Christophe JAILLET
2024-02-28 10:17 ` Dan Carpenter [this message]
2024-02-28 17:59 ` Christophe JAILLET
2024-02-28 10:24 ` Jiri Pirko
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=3b12e1e2-4859-40b6-8d9d-0a940251bed4@moroto.mountain \
--to=dan.carpenter@linaro.org \
--cc=andy@greyhouse.net \
--cc=christophe.jaillet@wanadoo.fr \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.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
all inboxes | Powered by JetHome®