Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 14:42:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

mac80211: fix a few RCU issues

Browse Source 
A few configuration functions correctly do
rcu_read_lock() but don't correctly reference
some pointers protected by RCU. Fix that.

Cc: stable@kernel.org
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 2011-05-12 15:11:37 +02:00 committed by John W. Linville
parent 8cb231530f
commit a3836e02ba
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/mac80211/cfg.c
View File

@ -223,11 +223,11 @@ static int ieee80211_get_key(struct wiphy *wiphy, struct net_device *dev,
goto out; goto out;
if (pairwise) if (pairwise)
key = sta->ptk; key = rcu_dereference(sta->ptk);
else if (key_idx < NUM_DEFAULT_KEYS) else if (key_idx < NUM_DEFAULT_KEYS)
key = sta->gtk[key_idx]; key = rcu_dereference(sta->gtk[key_idx]);
} else } else
key = sdata->keys[key_idx]; key = rcu_dereference(sdata->keys[key_idx]);
if (!key) if (!key)
goto out; goto out;
@ -952,8 +952,10 @@ static int ieee80211_change_mpath(struct wiphy *wiphy,
static void mpath_set_pinfo(struct mesh_path *mpath, u8 *next_hop, static void mpath_set_pinfo(struct mesh_path *mpath, u8 *next_hop,
struct mpath_info *pinfo) struct mpath_info *pinfo)
{ {
if (mpath->next_hop) struct sta_info *next_hop_sta = rcu_dereference(mpath->next_hop);
memcpy(next_hop, mpath->next_hop->sta.addr, ETH_ALEN);
if (next_hop_sta)
memcpy(next_hop, next_hop_sta->sta.addr, ETH_ALEN);
else else
memset(next_hop, 0, ETH_ALEN); memset(next_hop, 0, ETH_ALEN);