mac80211: Do not call cfg80211_send_disassoc with rcu held
Subsystems (2)
PATCH 1/1 mac80211: Do not call cfg80211_send_disassoc with rcu held
cfg80211_send_mlme_event() uses GFP_KERNEL and could sleep. Better not call it with rcu_read_lock held.
--- net/mac80211/mlme.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
net/mac80211/mlme.c +9 -9
@@ -874,15 +874,6 @@ static void ieee80211_set_disassoc(strucieee80211_rx_bss_put (local, bss); } -if (self_disconnected) { -if (deauth) -ieee80211_send_deauth_disassoc (sdata, -IEEE80211_STYPE_DEAUTH , reason); -else -ieee80211_send_deauth_disassoc (sdata, -IEEE80211_STYPE_DISASSOC , reason); - } - ifmgd->flags &= ~IEEE80211_STA_ASSOCIATED ; changed |=ieee80211_reset_erp_info (sdata);
@@ -901,6 +892,15 @@ static void ieee80211_set_disassoc(strucrcu_read_unlock (); +if (self_disconnected) { +if (deauth) +ieee80211_send_deauth_disassoc (sdata, +IEEE80211_STYPE_DEAUTH , reason); +else +ieee80211_send_deauth_disassoc (sdata, +IEEE80211_STYPE_DISASSOC , reason); + } +/* channel(_type) changes are handled by ieee80211_hw_config */ local->oper_channel_type =NL80211_CHAN_NO_HT ;
Signature · 1 line
Jouni Malinen PGP id EFC895FA
Quoted 2 lines · Jouni Malinen
cfg80211_send_mlme_event()usesGFP_KERNELand could sleep. Better not call it withrcu_read_lockheld.
Please drop this; moving the deauth/disassoc frame TX here is not the best idea. I'll figure out something safer to fix this.
Signature · 1 line
Jouni Malinen PGP id EFC895FA
PATCH 1/1 nl80211: Make nl80211_send_mlme_event() atomic
One of the code paths sending deauth/disassoc events ends up calling this function with rcu_read_lock held, so we must use GFP_ATOMIC in allocation routines.
--- net/wireless/nl80211.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(patch managed to modify incorrect function with some pending patches, so there is some extra context here to make sure these changes end up in nl80211_send_mlme_event() regardless of whether the other patches are applied or not since this fix is needed for both 2.6.30 and current wireless-testing.git)
net/wireless/nl80211.c +2 -2
@@ -3483,17 +3483,17 @@ nla_put_failure:static void nl80211_send_mlme_event (struct cfg80211_registered_device *rdev,struct net_device *netdev,const u8 *buf,size_t len,enum nl80211_commands cmd) {struct sk_buff *msg;void *hdr; - msg =nlmsg_new (NLMSG_GOODSIZE ,GFP_KERNEL ); + msg =nlmsg_new (NLMSG_GOODSIZE ,GFP_ATOMIC );if (!msg)return ; hdr =nl80211hdr_put (msg,0 ,0 ,0 , cmd);if (!hdr) {nlmsg_free (msg);return ; }
@@ -3502,17 +3502,17 @@ static void nl80211_send_mlme_event(struNLA_PUT_U32 (msg,NL80211_ATTR_IFINDEX , netdev->ifindex);NLA_PUT (msg,NL80211_ATTR_FRAME , len, buf);if (genlmsg_end (msg, hdr) <0 ) {nlmsg_free (msg);return ; } -genlmsg_multicast (msg,0 , nl80211_mlme_mcgrp.id,GFP_KERNEL ); +genlmsg_multicast (msg,0 , nl80211_mlme_mcgrp.id,GFP_ATOMIC );return ; nla_put_failure:genlmsg_cancel (msg, hdr);nlmsg_free (msg); } void nl80211_send_rx_auth(struct cfg80211_registered_device *rdev,
Signature · 1 line
Jouni Malinen PGP id EFC895FA