summaryrefslogtreecommitdiff
path: root/net/mac80211
diff options
context:
space:
mode:
authorJavier Cardona <javier@cozybit.com>2011-10-06 14:54:22 -0700
committerJohn W. Linville <linville@tuxdriver.com>2011-10-11 16:41:12 -0400
commit97091317aa86955dfacf1e1b2ed55cd9e399958c (patch)
tree52289b9b7ba0d622667d5c0997adacd6b12629a1 /net/mac80211
parent3d82de0fa584fbe73cf74a3bbc906c8710c523b8 (diff)
downloadlinux-3.10-97091317aa86955dfacf1e1b2ed55cd9e399958c.tar.gz
linux-3.10-97091317aa86955dfacf1e1b2ed55cd9e399958c.tar.bz2
linux-3.10-97091317aa86955dfacf1e1b2ed55cd9e399958c.zip
mac80211: Fix regression that allowed mpaths between non-peers.
Mesh paths should only exist over established peer links. Signed-off-by: Javier Cardona <javier@cozybit.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/mesh_hwmp.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index 6df7913d7ca..174040a4288 100644
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@ -789,11 +789,20 @@ void mesh_rx_path_sel_frame(struct ieee80211_sub_if_data *sdata,
struct ieee802_11_elems elems;
size_t baselen;
u32 last_hop_metric;
+ struct sta_info *sta;
/* need action_code */
if (len < IEEE80211_MIN_ACTION_SIZE + 1)
return;
+ rcu_read_lock();
+ sta = sta_info_get(sdata, mgmt->sa);
+ if (!sta || sta->plink_state != NL80211_PLINK_ESTAB) {
+ rcu_read_unlock();
+ return;
+ }
+ rcu_read_unlock();
+
baselen = (u8 *) mgmt->u.action.u.mesh_action.variable - (u8 *) mgmt;
ieee802_11_parse_elems(mgmt->u.action.u.mesh_action.variable,
len - baselen, &elems);