]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: hinic: Fix error handling in hinic_module_init()
authorYuan Can <yuancan@huawei.com>
Thu, 10 Nov 2022 02:16:42 +0000 (02:16 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 25 Nov 2022 16:45:46 +0000 (17:45 +0100)
[ Upstream commit 8eab9be56cc6b702a445d2b6d0256aa0992316b3 ]

A problem about hinic create debugfs failed is triggered with the
following log given:

 [  931.419023] debugfs: Directory 'hinic' with parent '/' already present!

The reason is that hinic_module_init() returns pci_register_driver()
directly without checking its return value, if pci_register_driver()
failed, it returns without destroy the newly created debugfs, resulting
the debugfs of hinic can never be created later.

 hinic_module_init()
   hinic_dbg_register_debugfs() # create debugfs directory
   pci_register_driver()
     driver_register()
       bus_add_driver()
         priv = kzalloc(...) # OOM happened
   # return without destroy debugfs directory

Fix by removing debugfs when pci_register_driver() returns error.

Fixes: 253ac3a97921 ("hinic: add support to query sq info")
Signed-off-by: Yuan Can <yuancan@huawei.com>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Link: https://lore.kernel.org/r/20221110021642.80378-1-yuancan@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/huawei/hinic/hinic_main.c

index 4f1d585485d7ac74370438d5c925d49ac2a37a01..6ec042d48cd1f35a2fa34c179e757a707be640c2 100644 (file)
@@ -1502,8 +1502,15 @@ static struct pci_driver hinic_driver = {
 
 static int __init hinic_module_init(void)
 {
+       int ret;
+
        hinic_dbg_register_debugfs(HINIC_DRV_NAME);
-       return pci_register_driver(&hinic_driver);
+
+       ret = pci_register_driver(&hinic_driver);
+       if (ret)
+               hinic_dbg_unregister_debugfs();
+
+       return ret;
 }
 
 static void __exit hinic_module_exit(void)