Commit 293c0d71 authored Nov 14, 2022 by Yuan Can Committed by Greg Kroah-Hartman Nov 25, 2022

net: thunderbolt: Fix error handling in tbnet_init()



[ Upstream commit f524b7289bbb0c8ffaa2ba3c34c146e43da54fb2 ]

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: Yuan Can <yuancan@huawei.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent e6546d54

drivers/net/thunderbolt.c

+14 −5

Original line number	Diff line number	Diff line
		@@ -1339,12 +1339,21 @@ static int __init tbnet_init(void)
		TBNET_MATCH_FRAGS_ID);

		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);