Skip to content

Commit

Permalink
cfg80211: fix race in giwrate
Browse files Browse the repository at this point in the history
cfg80211_wext_giwrate doesn't lock the wdev, so it
cannot access current_bss race-free. Also, there's
little point in trying to ask the driver for an AP
that it never told us about, so avoid that case.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Johannes Berg authored and John W. Linville committed Jul 24, 2009
1 parent e0f114e commit a71d62d
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions net/wireless/wext-compat.c
Original file line number Diff line number Diff line change
Expand Up @@ -1127,7 +1127,7 @@ int cfg80211_wext_giwrate(struct net_device *dev,
struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
/* we are under RTNL - globally locked - so can use a static struct */
static struct station_info sinfo;
u8 *addr;
u8 addr[ETH_ALEN];
int err;

if (wdev->iftype != NL80211_IFTYPE_STATION)
Expand All @@ -1136,12 +1136,15 @@ int cfg80211_wext_giwrate(struct net_device *dev,
if (!rdev->ops->get_station)
return -EOPNOTSUPP;

err = 0;
wdev_lock(wdev);
if (wdev->current_bss)
addr = wdev->current_bss->pub.bssid;
else if (wdev->wext.connect.bssid)
addr = wdev->wext.connect.bssid;
memcpy(addr, wdev->current_bss->pub.bssid, ETH_ALEN);
else
return -EOPNOTSUPP;
err = -EOPNOTSUPP;
wdev_unlock(wdev);
if (err)
return err;

err = rdev->ops->get_station(&rdev->wiphy, dev, addr, &sinfo);
if (err)
Expand Down

0 comments on commit a71d62d

Please sign in to comment.