Commit f524b728 authored by Yuan Can's avatar Yuan Can Committed by David S. Miller
Browse files

net: thunderbolt: Fix error handling in tbnet_init() 



A problem about insmod thunderbolt-net failed is triggered with following
log given while lsmod does not show thunderbolt_net:

 insmod: ERROR: could not insert module thunderbolt-net.ko: File exists

The reason is that tbnet_init() returns tb_register_service_driver()
directly without checking its return value, if tb_register_service_driver()
failed, it returns without removing property directory, resulting the
property directory can never be created later.

 tbnet_init()
   tb_register_property_dir() # register property directory
   tb_register_service_driver()
     driver_register()
       bus_add_driver()
         priv = kzalloc(...) # OOM happened
   # return without remove property directory

Fix by remove property directory when tb_register_service_driver() returns
error.

Fixes: e69b6c02 ("net: Add support for networking over Thunderbolt cable")
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
Acked-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e4aa85cf

drivers/net/thunderbolt.c

+14 −5
Original line number Diff line number Diff line
@@ -1391,12 +1391,21 @@ static int __init tbnet_init(void) 
	tb_property_add_immediate(tbnet_dir, "prtcstns", flags);



	ret = tb_register_property_dir("network", tbnet_dir);

	if (ret) {

	if (ret)

		goto err_free_dir;



	ret = tb_register_service_driver(&tbnet_driver);

	if (ret)

		goto err_unregister;



	return 0;



err_unregister:

	tb_unregister_property_dir("network", tbnet_dir);

err_free_dir:

	tb_property_free_dir(tbnet_dir);

		return ret;

	}



	return tb_register_service_driver(&tbnet_driver);

	return ret;

}

module_init(tbnet_init);