Skip to content

Commit 05cc09d

Browse files
khoroshilovjmberg-intel
authored andcommitted
mac80211_hwsim: fix module init error paths for netlink
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 <[email protected]> Fixes: 6275936 ("mac80211-hwsim: Provide multicast event for HWSIM_CMD_NEW_RADIO") Signed-off-by: Johannes Berg <[email protected]>
1 parent ea53abf commit 05cc09d

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

drivers/net/wireless/mac80211_hwsim.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3703,16 +3703,16 @@ static int __init init_mac80211_hwsim(void)
37033703
if (err)
37043704
goto out_unregister_pernet;
37053705

3706+
err = hwsim_init_netlink();
3707+
if (err)
3708+
goto out_unregister_driver;
3709+
37063710
hwsim_class = class_create(THIS_MODULE, "mac80211_hwsim");
37073711
if (IS_ERR(hwsim_class)) {
37083712
err = PTR_ERR(hwsim_class);
3709-
goto out_unregister_driver;
3713+
goto out_exit_netlink;
37103714
}
37113715

3712-
err = hwsim_init_netlink();
3713-
if (err < 0)
3714-
goto out_unregister_driver;
3715-
37163716
for (i = 0; i < radios; i++) {
37173717
struct hwsim_new_radio_params param = { 0 };
37183718

@@ -3818,6 +3818,8 @@ static int __init init_mac80211_hwsim(void)
38183818
free_netdev(hwsim_mon);
38193819
out_free_radios:
38203820
mac80211_hwsim_free();
3821+
out_exit_netlink:
3822+
hwsim_exit_netlink();
38213823
out_unregister_driver:
38223824
platform_driver_unregister(&mac80211_hwsim_driver);
38233825
out_unregister_pernet:

0 commit comments

Comments
 (0)