Merge remote-tracking branch 'ovl/rename2' into for-linus

1 files changed, 7 insertions, 1 deletions

diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c
index a9aff6079c42..afa94687d5e1 100644
--- a/net/mac80211/agg-rx.c
+++ b/net/mac80211/agg-rx.c
@@ -261,10 +261,16 @@ void __ieee80211_start_rx_ba_session(struct sta_info *sta,
                 .timeout = timeout,
                 .ssn = start_seq_num,
         };
-
         int i, ret = -EOPNOTSUPP;
         u16 status = WLAN_STATUS_REQUEST_DECLINED;
 
+        if (tid >= IEEE80211_FIRST_TSPEC_TSID) {
+                ht_dbg(sta->sdata,
+                       "STA %pM requests BA session on unsupported tid %d\n",
+                       sta->sta.addr, tid);
+                goto end_no_lock;
+        }
+
         if (!sta->sta.ht_cap.ht_supported) {
                 ht_dbg(sta->sdata,
                        "STA %pM erroneously requests BA session on tid %d w/o QoS\n",