* [PATCH AUTOSEL 4.14 01/41] mac80211_hwsim: fix module init error paths for netlink
@ 2018-12-13 4:30 Sasha Levin
2018-12-13 9:15 ` Kalle Valo
0 siblings, 1 reply; 2+ messages in thread
From: Sasha Levin @ 2018-12-13 4:30 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Alexey Khoroshilov, Johannes Berg, Sasha Levin, linux-wireless, netdev
From: Alexey Khoroshilov <khoroshilov@ispras.ru>
[ 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: 62759361eb49 ("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>
---
drivers/net/wireless/mac80211_hwsim.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 477f9f2f6626..4886141e85ba 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -3472,16 +3472,16 @@ static int __init init_mac80211_hwsim(void)
if (err)
goto out_unregister_pernet;
+ err = hwsim_init_netlink();
+ if (err)
+ goto out_unregister_driver;
+
hwsim_class = class_create(THIS_MODULE, "mac80211_hwsim");
if (IS_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++) {
struct hwsim_new_radio_params param = { 0 };
@@ -3587,6 +3587,8 @@ static int __init init_mac80211_hwsim(void)
free_netdev(hwsim_mon);
out_free_radios:
mac80211_hwsim_free();
+out_exit_netlink:
+ hwsim_exit_netlink();
out_unregister_driver:
platform_driver_unregister(&mac80211_hwsim_driver);
out_unregister_pernet:
--
2.19.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH AUTOSEL 4.14 01/41] mac80211_hwsim: fix module init error paths for netlink
2018-12-13 4:30 [PATCH AUTOSEL 4.14 01/41] mac80211_hwsim: fix module init error paths for netlink Sasha Levin
@ 2018-12-13 9:15 ` Kalle Valo
0 siblings, 0 replies; 2+ messages in thread
From: Kalle Valo @ 2018-12-13 9:15 UTC (permalink / raw)
To: Sasha Levin
Cc: linux-kernel, stable, Alexey Khoroshilov, Johannes Berg,
linux-wireless, netdev
Sasha Levin <sashal@kernel.org> writes:
> From: Alexey Khoroshilov <khoroshilov@ispras.ru>
>
> [ 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: 62759361eb49 ("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>
BTW, thanks for adding "X-Patchwork-Hint: Ignore" to the headers. I
don't see this patch in patchwork and that helps me a lot :)
--
Kalle Valo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-12-13 9:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-13 4:30 [PATCH AUTOSEL 4.14 01/41] mac80211_hwsim: fix module init error paths for netlink Sasha Levin
2018-12-13 9:15 ` Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).