Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
References: <20220607122831.32738-1-xiaohuizhang@ruc.edu.cn>
User-agent: mu4e 1.6.10; emacs 28.0.91
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
In-Reply-To: <20220607122831.32738-1-xiaohuizhang@ruc.edu.cn>
Message-ID: <pj41zly1y8pabi.fsf@u570694869fb251.ant.amazon.com>
MIME-Version: 1.0
Content-Type: text/plain; format=flowed
Precedence: bulk


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)