Commit 1a866054 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-2023-08-22' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless 

Johannes Berg says:

====================
Two fixes:
 - reorder buffer filter checks can cause bad shift/UBSAN
   warning with newer HW, avoid the check (mac80211)
 - add Kconfig dependency for iwlwifi for PTP clock usage

* tag 'wireless-2023-08-22' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless:
  wifi: mac80211: limit reorder_buf_filtered to avoid UBSAN warning
  wifi: iwlwifi: mvm: add dependency for PTP clock
====================

Link: https://lore.kernel.org/r/20230822124206.43926-2-johannes@sipsolutions.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 44f0fb8d b98c1610

drivers/net/wireless/intel/iwlwifi/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ config IWLMVM 
	tristate "Intel Wireless WiFi MVM Firmware support"

	select WANT_DEV_COREDUMP

	depends on MAC80211

	depends on PTP_1588_CLOCK_OPTIONAL

	help

	  This is the driver that supports the MVM firmware. The list

	  of the devices that use this firmware is available here:

include/net/mac80211.h

+1 −0
Original line number Diff line number Diff line
@@ -6612,6 +6612,7 @@ void ieee80211_stop_rx_ba_session(struct ieee80211_vif *vif, u16 ba_rx_bitmap, 
 * marks frames marked in the bitmap as having been filtered. Afterwards, it

 * checks if any frames in the window starting from @ssn can now be released

 * (in case they were only waiting for frames that were filtered.)

 * (Only work correctly if @max_rx_aggregation_subframes <= 64 frames)

 */

void ieee80211_mark_rx_ba_filtered_frames(struct ieee80211_sta *pubsta, u8 tid,

					  u16 ssn, u64 filtered,

net/mac80211/rx.c

+10 −2
Original line number Diff line number Diff line
@@ -1083,7 +1083,8 @@ static inline bool ieee80211_rx_reorder_ready(struct tid_ampdu_rx *tid_agg_rx, 
	struct sk_buff *tail = skb_peek_tail(frames);

	struct ieee80211_rx_status *status;



	if (tid_agg_rx->reorder_buf_filtered & BIT_ULL(index))

	if (tid_agg_rx->reorder_buf_filtered &&

	    tid_agg_rx->reorder_buf_filtered & BIT_ULL(index))

		return true;



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



no_frame:

	if (tid_agg_rx->reorder_buf_filtered)

		tid_agg_rx->reorder_buf_filtered &= ~BIT_ULL(index);

	tid_agg_rx->head_seq_num = ieee80211_sn_inc(tid_agg_rx->head_seq_num);

}
@@ -4264,6 +4266,7 @@ void ieee80211_mark_rx_ba_filtered_frames(struct ieee80211_sta *pubsta, u8 tid, 
					  u16 ssn, u64 filtered,

					  u16 received_mpdus)

{

	struct ieee80211_local *local;

	struct sta_info *sta;

	struct tid_ampdu_rx *tid_agg_rx;

	struct sk_buff_head frames;
@@ -4281,6 +4284,11 @@ void ieee80211_mark_rx_ba_filtered_frames(struct ieee80211_sta *pubsta, u8 tid, 


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



	local = sta->sdata->local;

	WARN_ONCE(local->hw.max_rx_aggregation_subframes > 64,

		  "RX BA marker can't support max_rx_aggregation_subframes %u > 64\n",

		  local->hw.max_rx_aggregation_subframes);



	if (!ieee80211_rx_data_set_sta(&rx, sta, -1))

		return;