eeprom: idt_89hpesx: Fix error handling in idt_init()
authorYuan Can <yuancan@huawei.com>
Thu, 10 Nov 2022 02:00:30 +0000 (02:00 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 20 Jan 2023 11:05:26 +0000 (12:05 +0100)
A problem about idt_89hpesx create debugfs failed is triggered with the
following log given:

 [ 4973.269647] debugfs: Directory 'idt_csr' with parent '/' already present!

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

 idt_init()
   debugfs_create_dir() # create debugfs directory
   i2c_add_driver()
     driver_register()
       bus_add_driver()
         priv = kzalloc(...) # OOM happened
   # return without destroy debugfs directory

Fix by removing debugfs when i2c_add_driver() returns error.

Fixes: cfad6425382e ("eeprom: Add IDT 89HPESx EEPROM/CSR driver")
Signed-off-by: Yuan Can <yuancan@huawei.com>
Acked-by: Serge Semin <fancer.lancer@gmail.com>
Link: https://lore.kernel.org/r/20221110020030.47711-1-yuancan@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/eeprom/idt_89hpesx.c

index 4e07ee9..7075d0b 100644 (file)
@@ -1566,12 +1566,20 @@ static struct i2c_driver idt_driver = {
  */
 static int __init idt_init(void)
 {
+       int ret;
+
        /* Create Debugfs directory first */
        if (debugfs_initialized())
                csr_dbgdir = debugfs_create_dir("idt_csr", NULL);
 
        /* Add new i2c-device driver */
-       return i2c_add_driver(&idt_driver);
+       ret = i2c_add_driver(&idt_driver);
+       if (ret) {
+               debugfs_remove_recursive(csr_dbgdir);
+               return ret;
+       }
+
+       return 0;
 }
 module_init(idt_init);