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>

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index dd49b2292b5f109e2cadb9f4353e47be5e43a329..72e84a209e6c85011174aaec544abdf22f68ff8f 100644 (file)
--- 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;
 
@@ -1390,8 +1393,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;
 }
@@ -1404,7 +1409,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);