2013-04-10 16:40:29

by Martin Pitt

Subject: mac80211_hwsim: Check return value of driver_register

If driver_register() fails, properly exit with the same error code.

Signed-off-by: Martin Pitt <[email protected]>
---
drivers/net/wireless/mac80211_hwsim.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 57361c3..a2224b7 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -2183,7 +2183,12 @@ static int __init init_mac80211_hwsim(void)
if (IS_ERR(hwsim_class))
return PTR_ERR(hwsim_class);

- driver_register(&mac80211_hwsim_driver);
+ err = driver_register(&mac80211_hwsim_driver);
+ if (err != 0) {
+ printk(KERN_DEBUG
+ "mac80211_hwsim: driver_register failed (%d)\n", err);
+ return err;
+ }

memset(addr, 0, ETH_ALEN);
addr[0] = 0x02;
--
1.7.2.5

--
Martin Pitt | http://www.piware.de
Ubuntu Developer (http://www.ubuntu.com) | Debian Developer (http://www.debian.org)

2013-04-10 17:05:43

by Johannes Berg

Subject: Re: mac80211_hwsim: Check return value of driver_register

On Wed, 2013-04-10 at 18:40 +0200, Martin Pitt wrote:
> If driver_register() fails, properly exit with the same error code.
>
> Signed-off-by: Martin Pitt <[email protected]>
> ---
> drivers/net/wireless/mac80211_hwsim.c | 7 ++++++-
> 1 files changed, 6 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
> index 57361c3..a2224b7 100644
> --- a/drivers/net/wireless/mac80211_hwsim.c
> +++ b/drivers/net/wireless/mac80211_hwsim.c
> @@ -2183,7 +2183,12 @@ static int __init init_mac80211_hwsim(void)
> if (IS_ERR(hwsim_class))
> return PTR_ERR(hwsim_class);
>
> - driver_register(&mac80211_hwsim_driver);
> + err = driver_register(&mac80211_hwsim_driver);
> + if (err != 0) {
> + printk(KERN_DEBUG
> + "mac80211_hwsim: driver_register failed (%d)\n", err);
> + return err;
> + }

Except you just leaked the class... I have a different fix already
anyway:

diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 9a0d526..b5117f5 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -2191,11 +2191,15 @@ static int __init init_mac80211_hwsim(void)
spin_lock_init(&hwsim_radio_lock);
INIT_LIST_HEAD(&hwsim_radios);

- hwsim_class = class_create(THIS_MODULE, "mac80211_hwsim");
- if (IS_ERR(hwsim_class))
- return PTR_ERR(hwsim_class);
+ err = driver_register(&mac80211_hwsim_driver);
+ if (err)
+ return err;

- driver_register(&mac80211_hwsim_driver);
+ hwsim_class = class_create(THIS_MODULE, "mac80211_hwsim");
+ if (IS_ERR(hwsim_class)) {
+ err = PTR_ERR(hwsim_class);
+ goto failed_unregister_driver;
+ }

memset(addr, 0, ETH_ALEN);
addr[0] = 0x02;
@@ -2529,6 +2533,7 @@ failed_drvdata:
ieee80211_free_hw(hw);
failed:
mac80211_hwsim_free();
+failed_unregister_driver:
driver_unregister(&mac80211_hwsim_driver);
return err;
}


johannes