From: Shay Agroskin <shayagr@amazon.com>
To: Xiaohui Zhang <xiaohuizhang@ruc.edu.cn>
Cc: Arthur Kiyanovski <akiyano@amazon.com>,
David Arinzon <darinzon@amazon.com>,
Noam Dagan <ndagan@amazon.com>, Saeed Bishara <saeedb@amazon.com>,
"David S . Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Sameeh Jubran <sameehj@amazon.com>, <netdev@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 1/1] net: ena_netdev: fix resource leak
Date: Tue, 7 Jun 2022 21:57:43 +0300 [thread overview]
Message-ID: <pj41zly1y8pabi.fsf@u570694869fb251.ant.amazon.com> (raw)
In-Reply-To: <20220607122831.32738-1-xiaohuizhang@ruc.edu.cn>
Xiaohui Zhang <xiaohuizhang@ruc.edu.cn> writes:
> Similar to the handling of u132_hcd_init in commit f276e002793c
> ("usb: u132-hcd: fix resource leak"), we thought a patch might
> be
> needed here as well.
>
> If platform_driver_register fails, cleanup the allocated
> resource
> gracefully.
>
> Signed-off-by: Xiaohui Zhang <xiaohuizhang@ruc.edu.cn>
> ---
> drivers/net/ethernet/amazon/ena/ena_netdev.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c
> b/drivers/net/ethernet/amazon/ena/ena_netdev.c
> index 6a356a6cee15..c0624ee8d867 100644
> --- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
> +++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
> @@ -4545,13 +4545,17 @@ static struct pci_driver ena_pci_driver
> = {
>
> static int __init ena_init(void)
> {
> + int retval;
> ena_wq = create_singlethread_workqueue(DRV_MODULE_NAME);
> if (!ena_wq) {
> pr_err("Failed to create workqueue\n");
> return -ENOMEM;
> }
> + retval = pci_register_driver(&ena_pci_driver);
> + if (retval)
> + destroy_workqueue(ena_wq);
>
> - return pci_register_driver(&ena_pci_driver);
> + return retval;
> }
>
> static void __exit ena_cleanup(void)
Hi,
thanks a lot for this patch. I made a few small changes in it to
make it more consistent with the rest of driver's code
(sorry don't really know how to insert an inline diff)
thanks,
Shay
---
diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c
b/drivers/net/ethernet/amazon/ena/ena_netdev.c
index 6a356a6cee15..be8d3c26c9bb 100644
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
@@ -4545,13 +4545,19 @@ static struct pci_driver ena_pci_driver =
{
static int __init ena_init(void)
{
+ int rc;
+
ena_wq = create_singlethread_workqueue(DRV_MODULE_NAME);
if (!ena_wq) {
pr_err("Failed to create workqueue\n");
return -ENOMEM;
}
- return pci_register_driver(&ena_pci_driver);
+ rc = pci_register_driver(&ena_pci_driver);
+ if (rc)
+ destroy_workqueue(ena_wq);
+
+ return rc;
}
static void __exit ena_cleanup(void)
prev parent reply other threads:[~2022-06-07 22:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-07 12:28 [PATCH 1/1] net: ena_netdev: fix resource leak Xiaohui Zhang
2022-06-07 18:57 ` Shay Agroskin [this message]
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=pj41zly1y8pabi.fsf@u570694869fb251.ant.amazon.com \
--to=shayagr@amazon.com \
--cc=akiyano@amazon.com \
--cc=darinzon@amazon.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ndagan@amazon.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=saeedb@amazon.com \
--cc=sameehj@amazon.com \
--cc=xiaohuizhang@ruc.edu.cn \
/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).