iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cfg80211: fix locking

Browse Source 
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>
This commit is contained in:
Johannes Berg 2010-09-30 22:17:43 +02:00 committed by John W. Linville
parent b1ae1edf9e
commit 2234362c42
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/wireless/nl80211.c
View File

@ -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); result = get_rdev_dev_by_info_ifindex(info, &rdev, &netdev);
if (result) if (result)
goto unlock; goto unlock_rtnl;
result = __nl80211_set_channel(rdev, netdev->ieee80211_ptr, info); result = __nl80211_set_channel(rdev, netdev->ieee80211_ptr, info);
unlock: dev_put(netdev);
cfg80211_unlock_rdev(rdev);
unlock_rtnl:
rtnl_unlock(); rtnl_unlock();
return result; 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); err = get_rdev_dev_by_info_ifindex(info, &rdev, &dev);
if (err) if (err)
goto unlock_rdev; goto unlock_rtnl;
wdev = dev->ieee80211_ptr; 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, err = rdev->ops->set_cqm_rssi_config(wdev->wiphy, dev,
threshold, hysteresis); threshold, hysteresis);
unlock_rdev: unlock_rdev:
cfg80211_unlock_rdev(rdev); cfg80211_unlock_rdev(rdev);
dev_put(dev); dev_put(dev);
unlock_rtnl:
rtnl_unlock(); rtnl_unlock();
return err; return err;