Skip to content

Commit

Permalink
mac80211: Protect Deauthentication frame when using MFP
Browse files Browse the repository at this point in the history
When management frame protection (IEEE 802.11w) is used,
Deauthentication frame needs to be protected when the pairwise key is
configured. mac80211 was removing the station entry (and its keys)
before actually sending out the Deauthentication frame. Fix this by
reordering the code to send the frame before the station entry gets
removed. This matches an earlier change that handled the Disassociation
frame processing, but missed Deauthentication frames.

Signed-off-by: Jouni Malinen <jouni.malinen@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Jouni Malinen authored and John W. Linville committed Jun 15, 2010
1 parent ff61638 commit 05e48e8
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions net/mac80211/mlme.c
Original file line number Diff line number Diff line change
Expand Up @@ -2158,14 +2158,16 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,
struct ieee80211_local *local = sdata->local;
struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
struct ieee80211_work *wk;
const u8 *bssid = req->bss->bssid;
u8 bssid[ETH_ALEN];
bool assoc_bss = false;

mutex_lock(&ifmgd->mtx);

memcpy(bssid, req->bss->bssid, ETH_ALEN);
if (ifmgd->associated == req->bss) {
bssid = req->bss->bssid;
ieee80211_set_disassoc(sdata, true);
ieee80211_set_disassoc(sdata, false);
mutex_unlock(&ifmgd->mtx);
assoc_bss = true;
} else {
bool not_auth_yet = false;

Expand Down Expand Up @@ -2211,6 +2213,8 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,
ieee80211_send_deauth_disassoc(sdata, bssid, IEEE80211_STYPE_DEAUTH,
req->reason_code, cookie,
!req->local_state_change);
if (assoc_bss)
sta_info_destroy_addr(sdata, bssid);

ieee80211_recalc_idle(sdata->local);

Expand Down

0 comments on commit 05e48e8

Please sign in to comment.