Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a4d73ee168eeaed3baea86542ad42e1fd7e192d3
Commit:     a4d73ee168eeaed3baea86542ad42e1fd7e192d3
Parent:     b86e0280bb5585a610783ff5392d9d439dee7ddd
Author:     Johannes Berg <[EMAIL PROTECTED]>
AuthorDate: Thu Apr 26 20:50:35 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Thu Apr 26 20:50:35 2007 -0700

    [WIRELESS] cfg80211: Fix locking in wiphy_new.
    
    This patch fixes the locking in wiphy new. Ingo Oeser
    <[EMAIL PROTECTED]> noticed that locking in the error case was wrong and
    also suggested this fix.
    
    Signed-off-by: Johannes Berg <[EMAIL PROTECTED]>
    Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 net/wireless/core.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/net/wireless/core.c b/net/wireless/core.c
index 532e1e0..24a21ad 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -53,21 +53,25 @@ struct wiphy *wiphy_new(struct cfg80211_ops *ops, int 
sizeof_priv)
 
        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! */
                kfree(drv);
                return NULL;
        }
-       drv->idx = wiphy_counter;
 
        /* give it a proper name */
        snprintf(drv->wiphy.dev.bus_id, BUS_ID_SIZE,
                 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->devlist_mtx);
        INIT_LIST_HEAD(&drv->netdev_list);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to