Patch "fm10k: Fix error handling in fm10k_init_module()" has been added to the 6.0-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    fm10k: Fix error handling in fm10k_init_module()

to the 6.0-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     fm10k-fix-error-handling-in-fm10k_init_module.patch
and it can be found in the queue-6.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 5031932e18dc3cd8589351ae92643f6c6404b0a0
Author: Yuan Can <yuancan@xxxxxxxxxx>
Date:   Mon Nov 14 08:26:39 2022 +0000

    fm10k: Fix error handling in fm10k_init_module()
    
    [ Upstream commit 771a794c0a3c3e7f0d86cc34be4f9537e8c0a20c ]
    
    A problem about modprobe fm10k failed is triggered with the following log
    given:
    
     Intel(R) Ethernet Switch Host Interface Driver
     Copyright(c) 2013 - 2019 Intel Corporation.
     debugfs: Directory 'fm10k' with parent '/' already present!
    
    The reason is that fm10k_init_module() returns fm10k_register_pci_driver()
    directly without checking its return value, if fm10k_register_pci_driver()
    failed, it returns without removing debugfs and destroy workqueue,
    resulting the debugfs of fm10k can never be created later and leaks the
    workqueue.
    
     fm10k_init_module()
       alloc_workqueue()
       fm10k_dbg_init() # create debugfs
       fm10k_register_pci_driver()
         pci_register_driver()
           driver_register()
             bus_add_driver()
               priv = kzalloc(...) # OOM happened
       # return without remove debugfs and destroy workqueue
    
    Fix by remove debugfs and destroy workqueue when
    fm10k_register_pci_driver() returns error.
    
    Fixes: 7461fd913afe ("fm10k: Add support for debugfs")
    Fixes: b382bb1b3e2d ("fm10k: use separate workqueue for fm10k driver")
    Signed-off-by: Yuan Can <yuancan@xxxxxxxxxx>
    Reviewed-by: Jacob Keller <jacob.e.keller@xxxxxxxxx>
    Signed-off-by: Tony Nguyen <anthony.l.nguyen@xxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
index 3362f26d7f99..1b273446621c 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
@@ -32,6 +32,8 @@ struct workqueue_struct *fm10k_workqueue;
  **/
 static int __init fm10k_init_module(void)
 {
+	int ret;
+
 	pr_info("%s\n", fm10k_driver_string);
 	pr_info("%s\n", fm10k_copyright);
 
@@ -43,7 +45,13 @@ static int __init fm10k_init_module(void)
 
 	fm10k_dbg_init();
 
-	return fm10k_register_pci_driver();
+	ret = fm10k_register_pci_driver();
+	if (ret) {
+		fm10k_dbg_exit();
+		destroy_workqueue(fm10k_workqueue);
+	}
+
+	return ret;
 }
 module_init(fm10k_init_module);