| Message ID | 1366363242-29481-1-git-send-email-cedric.voncken@acksys.fr (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Fri, 2013-04-19 at 11:20 +0200, cedric voncken wrote: > If the device uses the HT mode and receives a frame from a sta whith state < IEEE80211_STA_ASSOC > then the null pointer exception crashes the Linnux kernel. > > In the case of ath9k, the function ath_tx_node_init is indirectly called by drv_sta_state (in net/mac80211/driver-ops.h) only when the sta_state goes to IEEE80211_STA_ASSOC from IEEE80211_STA_AUTH. > > Signed-off-by: cedric VONCKEN <cedric.voncken@acksys.fr> > --- > net/mac80211/sta_info.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c > index 11216bc..bcfd7b0 100644 > --- a/net/mac80211/sta_info.c > +++ b/net/mac80211/sta_info.c > @@ -1040,7 +1040,8 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta) > BUILD_BUG_ON(BITS_TO_LONGS(IEEE80211_NUM_TIDS) > 1); > sta->driver_buffered_tids = 0; > > - if (!(local->hw.flags & IEEE80211_HW_AP_LINK_PS)) > + if (!(local->hw.flags & IEEE80211_HW_AP_LINK_PS && > + sta->sta_state >= IEEE80211_STA_ASSOC)) This seems like a bad workaround -- how are you getting to this point w/o being associated? johannes -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 11216bc..bcfd7b0 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -1040,7 +1040,8 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta) BUILD_BUG_ON(BITS_TO_LONGS(IEEE80211_NUM_TIDS) > 1); sta->driver_buffered_tids = 0; - if (!(local->hw.flags & IEEE80211_HW_AP_LINK_PS)) + if (!(local->hw.flags & IEEE80211_HW_AP_LINK_PS && + sta->sta_state >= IEEE80211_STA_ASSOC)) drv_sta_notify(local, sdata, STA_NOTIFY_AWAKE, &sta->sta); skb_queue_head_init(&pending);
If the device uses the HT mode and receives a frame from a sta whith state < IEEE80211_STA_ASSOC then the null pointer exception crashes the Linnux kernel. In the case of ath9k, the function ath_tx_node_init is indirectly called by drv_sta_state (in net/mac80211/driver-ops.h) only when the sta_state goes to IEEE80211_STA_ASSOC from IEEE80211_STA_AUTH. Signed-off-by: cedric VONCKEN <cedric.voncken@acksys.fr> --- net/mac80211/sta_info.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)