Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 246808
b: refs/heads/master
c: 53e8051
h: refs/heads/master
v: v3
  • Loading branch information
Javier Cardona authored and John W. Linville committed Apr 12, 2011
1 parent c62b68a commit 543bb5c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 71839121a0f35f9968d2e204a76eb22683156fd8
refs/heads/master: 53e805111b69d55834f4e1ed0a31a97ea0b9e425
9 changes: 9 additions & 0 deletions trunk/net/mac80211/mesh_plink.c
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,9 @@ int mesh_plink_open(struct sta_info *sta)
__le16 llid;
struct ieee80211_sub_if_data *sdata = sta->sdata;

if (!test_sta_flags(sta, WLAN_STA_AUTH))
return -EPERM;

spin_lock_bh(&sta->lock);
get_random_bytes(&llid, 2);
sta->llid = llid;
Expand Down Expand Up @@ -484,6 +487,12 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
return;
}

if (sta && !test_sta_flags(sta, WLAN_STA_AUTH)) {
mpl_dbg("Mesh plink: Action frame from non-authed peer\n");
rcu_read_unlock();
return;
}

if (sta && sta->plink_state == PLINK_BLOCKED) {
rcu_read_unlock();
return;
Expand Down

0 comments on commit 543bb5c

Please sign in to comment.