[PATCH] ixgbevf: Fix resource leak in ixgbevf_init_module()

[PATCH] ixgbevf: Fix resource leak in ixgbevf_init_module()

[Shang XiaoJing]

ixgbevf_init_module() won't destroy the workqueue created by
create_singlethread_workqueue() when pci_register_driver() failed. Add
destroy_workqueue() in fail path to prevent the resource leak.

Similar to the handling of u132_hcd_init in commit f276e002793c
("usb: u132-hcd: fix resource leak")

Fixes: 40a13e2493c9 ("ixgbevf: Use a private workqueue to avoid certain possible hangs")
Signed-off-by: Shang XiaoJing <shangxiaojing@huawei.com>
---
 drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 99933e89717a..e338fa572793 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -4869,6 +4869,8 @@ static struct pci_driver ixgbevf_driver = {
  **/
 static int __init ixgbevf_init_module(void)
 {
+	int err;
+
 	pr_info("%s\n", ixgbevf_driver_string);
 	pr_info("%s\n", ixgbevf_copyright);
 	ixgbevf_wq = create_singlethread_workqueue(ixgbevf_driver_name);
@@ -4877,7 +4879,13 @@ static int __init ixgbevf_init_module(void)
 		return -ENOMEM;
 	}
 
-	return pci_register_driver(&ixgbevf_driver);
+	err = pci_register_driver(&ixgbevf_driver);
+	if (err) {
+		destroy_workqueue(ixgbevf_wq);
+		return err;
+	}
+
+	return 0;
 }
 
 module_init(ixgbevf_init_module);
-- 
2.17.1

Re: [PATCH] ixgbevf: Fix resource leak in ixgbevf_init_module()

[Saeed Mahameed]

On 14 Nov 10:57, Shang XiaoJing wrote:
>ixgbevf_init_module() won't destroy the workqueue created by
>create_singlethread_workqueue() when pci_register_driver() failed. Add
>destroy_workqueue() in fail path to prevent the resource leak.
>
>Similar to the handling of u132_hcd_init in commit f276e002793c
>("usb: u132-hcd: fix resource leak")
>
>Fixes: 40a13e2493c9 ("ixgbevf: Use a private workqueue to avoid certain possible hangs")
>Signed-off-by: Shang XiaoJing <shangxiaojing@huawei.com>

Reviewed-by: Saeed Mahameed <saeed@kernel.org>

RE: [Intel-wired-lan] [PATCH] ixgbevf: Fix resource leak in ixgbevf_init_module()

[Jankowski, Konrad0]

> -----Original Message-----
> From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of Shang
> XiaoJing
> Sent: Monday, November 14, 2022 3:58 AM
> To: Brandeburg, Jesse <jesse.brandeburg@intel.com>; Nguyen, Anthony L
> <anthony.l.nguyen@intel.com>; davem@davemloft.net;
> edumazet@google.com; kuba@kernel.org; pabeni@redhat.com;
> jeffrey.t.kirsher@intel.com; Rustad, Mark D <mark.d.rustad@intel.com>; intel-
> wired-lan@lists.osuosl.org; netdev@vger.kernel.org
> Cc: shangxiaojing@huawei.com
> Subject: [Intel-wired-lan] [PATCH] ixgbevf: Fix resource leak in
> ixgbevf_init_module()
> 
> ixgbevf_init_module() won't destroy the workqueue created by
> create_singlethread_workqueue() when pci_register_driver() failed. Add
> destroy_workqueue() in fail path to prevent the resource leak.
> 
> Similar to the handling of u132_hcd_init in commit f276e002793c
> ("usb: u132-hcd: fix resource leak")
> 
> Fixes: 40a13e2493c9 ("ixgbevf: Use a private workqueue to avoid certain possible
> hangs")
> Signed-off-by: Shang XiaoJing <shangxiaojing@huawei.com>
> ---
>  drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
> b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
> index 99933e89717a..e338fa572793 100644
> --- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
> +++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
> @@ -4869,6 +4869,8 @@ static struct pci_driver ixgbevf_driver = {

Tested-by: Konrad Jankowski <konrad0.jankowski@intel.com>