Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4d73ee1 authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller
Browse files

[WIRELESS] cfg80211: Fix locking in wiphy_new. 



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: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b86e0280

net/wireless/core.c

+10 −6
Original line number Diff line number Diff line
@@ -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);