lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[WIRELESS] cfg80211: Fix locking in wiphy_new.

Browse Source 
This patch fixes the locking in wiphy new. Ingo Oeser
<netdev@axxeo.de> noticed that locking in the error case was wrong and
also suggested this fix.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Johannes Berg
2007-04-26 20:50:35 -07:00
committed by David S. Miller
parent b86e0280bb
commit a4d73ee168
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
net/wireless/core.c
View File

@@ -53,21 +53,25 @@ struct wiphy *wiphy_new(struct cfg80211_ops *ops, int sizeof_priv)
mutex_lock(&cfg80211_drv_mutex); mutex_lock(&cfg80211_drv_mutex);
if (unlikely(wiphy_counter<0)) { drv->idx = wiphy_counter;
/* now increase counter for the next device unless
* it has wrapped previously */
if (wiphy_counter >= 0)
wiphy_counter++;
mutex_unlock(&cfg80211_drv_mutex);
if (unlikely(drv->idx < 0)) {
/* ugh, wrapped! */ /* ugh, wrapped! */
kfree(drv); kfree(drv);
return NULL; return NULL;
} }
drv->idx = wiphy_counter;
/* give it a proper name */ /* give it a proper name */
snprintf(drv->wiphy.dev.bus_id, BUS_ID_SIZE, snprintf(drv->wiphy.dev.bus_id, BUS_ID_SIZE,
PHY_NAME "%d", drv->idx); PHY_NAME "%d", drv->idx);
/* now increase counter for the next time */
wiphy_counter++;
mutex_unlock(&cfg80211_drv_mutex);
mutex_init(&drv->mtx); mutex_init(&drv->mtx);
mutex_init(&drv->devlist_mtx); mutex_init(&drv->devlist_mtx);
INIT_LIST_HEAD(&drv->netdev_list); INIT_LIST_HEAD(&drv->netdev_list);