cfg80211: fix locking
Johannes Berg
maintainerPATCH 1/1 cfg80211: fix locking
From: Johannes Berg <[email protected]>
Add missing unlocking of the wiphy in set_channel, and don't try to unlock a non-existing wiphy in set_cqm.
Cc [email protected] [2.6.35+]
Signed-off-by Johannes Berg <[email protected]>
--- net/wireless/nl80211.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
net/wireless/nl80211.c +7 -4
@@ -821,11 +821,13 @@ static int nl80211_set_channel(struct sk result =get_rdev_dev_by_info_ifindex (info, &rdev, &netdev);if (result) - goto unlock; + goto unlock_rtnl; result =__nl80211_set_channel (rdev, netdev->ieee80211_ptr, info); - unlock: +dev_put (netdev); +cfg80211_unlock_rdev (rdev); + unlock_rtnl:rtnl_unlock ();return result;
@@ -5095,7 +5097,7 @@ static int nl80211_set_cqm_rssi(struct g err =get_rdev_dev_by_info_ifindex (info, &rdev, &dev);if (err) - goto unlock_rdev; + goto unlock_rtnl; wdev = dev->ieee80211_ptr;
@@ -5113,9 +5115,10 @@ static int nl80211_set_cqm_rssi(struct g err = rdev->ops->set_cqm_rssi_config (wdev->wiphy, dev, threshold, hysteresis); -unlock_rdev: + unlock_rdev:cfg80211_unlock_rdev (rdev);dev_put (dev); + unlock_rtnl:rtnl_unlock ();return err;