Skip to content

Commit 4c3c796

Browse files
Yuan Canjonmason
authored andcommitted
ntb: intel: Fix error handling in intel_ntb_pci_driver_init()
A problem about ntb_hw_intel create debugfs failed is triggered with the following log given: [ 273.112733] Intel(R) PCI-E Non-Transparent Bridge Driver 2.0 [ 273.115342] debugfs: Directory 'ntb_hw_intel' with parent '/' already present! The reason is that intel_ntb_pci_driver_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 ntb_hw_intel can never be created later. intel_ntb_pci_driver_init() debugfs_create_dir() # 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: e26a584 ("NTB: Split ntb_hw_intel and ntb_transport drivers") Signed-off-by: Yuan Can <yuancan@huawei.com> Acked-by: Dave Jiang <dave.jiang@intel.com> Signed-off-by: Jon Mason <jdmason@kudzu.us>
1 parent 98af0a3 commit 4c3c796

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

drivers/ntb/hw/intel/ntb_hw_gen1.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2064,12 +2064,17 @@ static struct pci_driver intel_ntb_pci_driver = {
20642064

20652065
static int __init intel_ntb_pci_driver_init(void)
20662066
{
2067+
int ret;
20672068
pr_info("%s %s\n", NTB_DESC, NTB_VER);
20682069

20692070
if (debugfs_initialized())
20702071
debugfs_dir = debugfs_create_dir(KBUILD_MODNAME, NULL);
20712072

2072-
return pci_register_driver(&intel_ntb_pci_driver);
2073+
ret = pci_register_driver(&intel_ntb_pci_driver);
2074+
if (ret)
2075+
debugfs_remove_recursive(debugfs_dir);
2076+
2077+
return ret;
20732078
}
20742079
module_init(intel_ntb_pci_driver_init);
20752080

0 commit comments

Comments
 (0)