From: "John W. Linville" Subject: [PATCH] wireless: convert reg_regdb_search_lock to mutex Date: Thu, 18 Mar 2010 15:40:43 -0400 Stanse discovered that kmalloc is being called with GFP_KERNEL while holding this spinlock. The spinlock can be a mutex instead, which also enables the removal of the unlock/lock around the lock/unlock of cfg80211_mutex and the call to set_regdom. Reported-by: Jiri Slaby Signed-off-by: John W. Linville --- net/wireless/reg.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) --- linux-2.6.18.noarch/net/wireless/reg.c.orig 2010-03-18 19:41:39.000000000 -0400 +++ linux-2.6.18.noarch/net/wireless/reg.c 2010-03-18 19:42:07.000000000 -0400 @@ -367,7 +367,7 @@ struct reg_regdb_search_request { }; static LIST_HEAD(reg_regdb_search_list); -static DEFINE_SPINLOCK(reg_regdb_search_lock); +static DEFINE_MUTEX(reg_regdb_search_mutex); static void reg_regdb_search(void *unused) { @@ -375,7 +375,7 @@ static void reg_regdb_search(void *unuse const struct ieee80211_regdomain *curdom, *regdom; int i, r; - spin_lock(®_regdb_search_lock); + mutex_lock(®_regdb_search_mutex); while (!list_empty(®_regdb_search_list)) { request = list_first_entry(®_regdb_search_list, struct reg_regdb_search_request, @@ -389,18 +389,16 @@ static void reg_regdb_search(void *unuse r = reg_copy_regd(®dom, curdom); if (r) break; - spin_unlock(®_regdb_search_lock); mutex_lock(&cfg80211_mutex); set_regdom(regdom); mutex_unlock(&cfg80211_mutex); - spin_lock(®_regdb_search_lock); break; } } kfree(request); } - spin_unlock(®_regdb_search_lock); + mutex_unlock(®_regdb_search_mutex); } static DECLARE_WORK(reg_regdb_work, reg_regdb_search, NULL); @@ -418,9 +416,9 @@ static void reg_regdb_query(const char * memcpy(request->alpha2, alpha2, 2); - spin_lock(®_regdb_search_lock); + mutex_lock(®_regdb_search_mutex); list_add_tail(&request->list, ®_regdb_search_list); - spin_unlock(®_regdb_search_lock); + mutex_unlock(®_regdb_search_mutex); schedule_work(®_regdb_work); }