diff options
| author | Juuso Oikarinen <juuso.oikarinen@nokia.com> | 2011-05-02 12:42:30 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-05-02 12:42:30 +0800 |
| commit | 59a81df491fd123de8b5d3a3d3a327d2fcf69cb4 (patch) | |
| tree | 993f8c120c98ae950d7e07aebc7211e4936e216f | |
| parent | 291bd71352119f303d6259dc58127a431462858d (diff) | |
wl12xx: Add mutex protection for interface list
The interface list maintained in main.c is not mutex protected. This could
cause issues, as the list is accessed from notifier chains.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Luciano Coelho <coelho@ti.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
| -rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index 6bb2f941f5c..7a543df16ff 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c @@ -339,6 +339,7 @@ static struct platform_device wl1271_device = { }, }; +static DEFINE_MUTEX(wl_list_mutex); static LIST_HEAD(wl_list); static int wl1271_dev_notify(struct notifier_block *me, unsigned long what, @@ -369,10 +370,12 @@ static int wl1271_dev_notify(struct notifier_block *me, unsigned long what, return NOTIFY_DONE; wl_temp = hw->priv; + mutex_lock(&wl_list_mutex); list_for_each_entry(wl, &wl_list, list) { if (wl == wl_temp) break; } + mutex_unlock(&wl_list_mutex); if (wl != wl_temp) return NOTIFY_DONE; @@ -1392,8 +1395,10 @@ power_off: out: mutex_unlock(&wl->mutex); + mutex_lock(&wl_list_mutex); if (!ret) list_add(&wl->list, &wl_list); + mutex_unlock(&wl_list_mutex); return ret; } @@ -1406,7 +1411,9 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl) wl1271_info("down"); + mutex_lock(&wl_list_mutex); list_del(&wl->list); + mutex_unlock(&wl_list_mutex); WARN_ON(wl->state != WL1271_STATE_ON); |