Skip to content

Commit b98c161

Browse files
Ping-Ke Shihjmberg-intel
authored andcommitted
wifi: mac80211: limit reorder_buf_filtered to avoid UBSAN warning
The commit 06470f7 ("mac80211: add API to allow filtering frames in BA sessions") added reorder_buf_filtered to mark frames filtered by firmware, and it can only work correctly if hw.max_rx_aggregation_subframes <= 64 since it stores the bitmap in a u64 variable. However, new HE or EHT devices can support BlockAck number up to 256 or 1024, and then using a higher subframe index leads UBSAN warning: UBSAN: shift-out-of-bounds in net/mac80211/rx.c:1129:39 shift exponent 215 is too large for 64-bit type 'long long unsigned int' Call Trace: <IRQ> dump_stack_lvl+0x48/0x70 dump_stack+0x10/0x20 __ubsan_handle_shift_out_of_bounds+0x1ac/0x360 ieee80211_release_reorder_frame.constprop.0.cold+0x64/0x69 [mac80211] ieee80211_sta_reorder_release+0x9c/0x400 [mac80211] ieee80211_prepare_and_rx_handle+0x1234/0x1420 [mac80211] ieee80211_rx_list+0xaef/0xf60 [mac80211] ieee80211_rx_napi+0x53/0xd0 [mac80211] Since only old hardware that supports <=64 BlockAck uses ieee80211_mark_rx_ba_filtered_frames(), limit the use as it is, so add a WARN_ONCE() and comment to note to avoid using this function if hardware capability is not suitable. Signed-off-by: Ping-Ke Shih <pkshih@realtek.com> Link: https://lore.kernel.org/r/20230818014004.16177-1-pkshih@realtek.com [edit commit message] Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1 parent 609a1bc commit b98c161

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

include/net/mac80211.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6612,6 +6612,7 @@ void ieee80211_stop_rx_ba_session(struct ieee80211_vif *vif, u16 ba_rx_bitmap,
66126612
* marks frames marked in the bitmap as having been filtered. Afterwards, it
66136613
* checks if any frames in the window starting from @ssn can now be released
66146614
* (in case they were only waiting for frames that were filtered.)
6615+
* (Only work correctly if @max_rx_aggregation_subframes <= 64 frames)
66156616
*/
66166617
void ieee80211_mark_rx_ba_filtered_frames(struct ieee80211_sta *pubsta, u8 tid,
66176618
u16 ssn, u64 filtered,

net/mac80211/rx.c

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1083,7 +1083,8 @@ static inline bool ieee80211_rx_reorder_ready(struct tid_ampdu_rx *tid_agg_rx,
10831083
struct sk_buff *tail = skb_peek_tail(frames);
10841084
struct ieee80211_rx_status *status;
10851085

1086-
if (tid_agg_rx->reorder_buf_filtered & BIT_ULL(index))
1086+
if (tid_agg_rx->reorder_buf_filtered &&
1087+
tid_agg_rx->reorder_buf_filtered & BIT_ULL(index))
10871088
return true;
10881089

10891090
if (!tail)
@@ -1124,7 +1125,8 @@ static void ieee80211_release_reorder_frame(struct ieee80211_sub_if_data *sdata,
11241125
}
11251126

11261127
no_frame:
1127-
tid_agg_rx->reorder_buf_filtered &= ~BIT_ULL(index);
1128+
if (tid_agg_rx->reorder_buf_filtered)
1129+
tid_agg_rx->reorder_buf_filtered &= ~BIT_ULL(index);
11281130
tid_agg_rx->head_seq_num = ieee80211_sn_inc(tid_agg_rx->head_seq_num);
11291131
}
11301132

@@ -4264,6 +4266,7 @@ void ieee80211_mark_rx_ba_filtered_frames(struct ieee80211_sta *pubsta, u8 tid,
42644266
u16 ssn, u64 filtered,
42654267
u16 received_mpdus)
42664268
{
4269+
struct ieee80211_local *local;
42674270
struct sta_info *sta;
42684271
struct tid_ampdu_rx *tid_agg_rx;
42694272
struct sk_buff_head frames;
@@ -4281,6 +4284,11 @@ void ieee80211_mark_rx_ba_filtered_frames(struct ieee80211_sta *pubsta, u8 tid,
42814284

42824285
sta = container_of(pubsta, struct sta_info, sta);
42834286

4287+
local = sta->sdata->local;
4288+
WARN_ONCE(local->hw.max_rx_aggregation_subframes > 64,
4289+
"RX BA marker can't support max_rx_aggregation_subframes %u > 64\n",
4290+
local->hw.max_rx_aggregation_subframes);
4291+
42844292
if (!ieee80211_rx_data_set_sta(&rx, sta, -1))
42854293
return;
42864294

0 commit comments

Comments
 (0)