cfg80211: fix locking

Add missing unlocking of the wiphy in set_channel,
and don't try to unlock a non-existing wiphy in
set_cqm.

Cc: stable@kernel.org [2.6.35+]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 7 insertions, 4 deletions

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index cbbbe9ab452f..21061ccee557 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -821,11 +821,13 @@ static int nl80211_set_channel(struct sk_buff *skb, struct genl_info *info)
 
         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;
@@ -5097,7 +5099,7 @@ static int nl80211_set_cqm_rssi(struct genl_info *info,
 
         err = get_rdev_dev_by_info_ifindex(info, &rdev, &dev);
         if (err)
-                goto unlock_rdev;
+                goto unlock_rtnl;
 
         wdev = dev->ieee80211_ptr;
 
@@ -5115,9 +5117,10 @@ static int nl80211_set_cqm_rssi(struct genl_info *info,
         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;