Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f61b7a3 authored by Johannes Berg's avatar Johannes Berg Committed by Johannes Berg
Browse files

mac80211_hwsim: fix module init error paths 



We didn't free the workqueue on any errors, nor did we
correctly check for rhashtable allocation errors, nor
did we free the hashtable on error.

Reported-by: default avatarColin King <colin.king@canonical.com>
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
parent 3c12d048

drivers/net/wireless/mac80211_hwsim.c

+9 −2
Original line number Diff line number Diff line
@@ -3572,11 +3572,14 @@ static int __init init_mac80211_hwsim(void) 
	hwsim_wq = alloc_workqueue("hwsim_wq", 0, 0);

	if (!hwsim_wq)

		return -ENOMEM;

	rhashtable_init(&hwsim_radios_rht, &hwsim_rht_params);



	err = rhashtable_init(&hwsim_radios_rht, &hwsim_rht_params);

	if (err)

		goto out_free_wq;



	err = register_pernet_device(&hwsim_net_ops);

	if (err)

		return err;

		goto out_free_rht;



	err = platform_driver_register(&mac80211_hwsim_driver);

	if (err)
@@ -3701,6 +3704,10 @@ static int __init init_mac80211_hwsim(void) 
	platform_driver_unregister(&mac80211_hwsim_driver);

out_unregister_pernet:

	unregister_pernet_device(&hwsim_net_ops);

out_free_rht:

	rhashtable_destroy(&hwsim_radios_rht);

out_free_wq:

	destroy_workqueue(hwsim_wq);

	return err;

}

module_init(init_mac80211_hwsim);