evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mac80211_hwsim: fix module init error paths for netlink

Browse source 
[ Upstream commit 05cc09de4c017663a217630682041066f2f9a5cd ]

There is no unregister netlink notifier and family on error paths
in init_mac80211_hwsim(). Also there is an error path where
hwsim_class is not destroyed.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Fixes: 62759361eb ("mac80211-hwsim: Provide multicast event for HWSIM_CMD_NEW_RADIO")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Alexey Khoroshilov 2018-10-05 23:22:06 +03:00 • committed by Greg Kroah-Hartman
parent 9cdcdad4c2
commit a33ba2d2aa
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/net/wireless/mac80211_hwsim.c
View file

@ -3195,16 +3195,16 @@ static int __init init_mac80211_hwsim(void)
if (err) if (err)
return err; return err;
err = hwsim_init_netlink();
if (err)
goto out_unregister_driver;
hwsim_class = class_create(THIS_MODULE, "mac80211_hwsim"); hwsim_class = class_create(THIS_MODULE, "mac80211_hwsim");
if (IS_ERR(hwsim_class)) { if (IS_ERR(hwsim_class)) {
err = PTR_ERR(hwsim_class); err = PTR_ERR(hwsim_class);
goto out_unregister_driver; goto out_exit_netlink;
} }
err = hwsim_init_netlink();
if (err < 0)
goto out_unregister_driver;
for (i = 0; i < radios; i++) { for (i = 0; i < radios; i++) {
struct hwsim_new_radio_params param = { 0 }; struct hwsim_new_radio_params param = { 0 };
@ -3310,6 +3310,8 @@ out_free_mon:
free_netdev(hwsim_mon); free_netdev(hwsim_mon);
out_free_radios: out_free_radios:
mac80211_hwsim_free(); mac80211_hwsim_free();
out_exit_netlink:
hwsim_exit_netlink();
out_unregister_driver: out_unregister_driver:
platform_driver_unregister(&mac80211_hwsim_driver); platform_driver_unregister(&mac80211_hwsim_driver);
return err; return err;