4.9-stable patches

added patches:
	wifi-mac80211_hwsim-avoid-mac80211-warning-on-bad-rate.patch

diff --git a/queue-4.9/series b/queue-4.9/series
index b49dfdf52b5a59f100709cb05e66173a004200b6..b16142b6120239b6806b8af9de0f2d674970bfd1 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -33,4 +33,4 @@ alsa-hda-fix-position-reporting-on-poulsbo.patch
 scsi-stex-properly-zero-out-the-passthrough-command-structure.patch
 usb-serial-qcserial-add-new-usb-id-for-dell-branded-em7455.patch
 random-avoid-reading-two-cache-lines-on-irq-randomness.patch
-random-use-expired-timer-rather-than-wq-for-mixing-fast-pool.patch
+wifi-mac80211_hwsim-avoid-mac80211-warning-on-bad-rate.patch

diff --git a/queue-4.9/wifi-mac80211_hwsim-avoid-mac80211-warning-on-bad-rate.patch b/queue-4.9/wifi-mac80211_hwsim-avoid-mac80211-warning-on-bad-rate.patch
new file mode 100644 (file)
index 0000000..4cb526e
--- /dev/null
+++ b/queue-4.9/wifi-mac80211_hwsim-avoid-mac80211-warning-on-bad-rate.patch
@@ -0,0 +1,36 @@
+From 1833b6f46d7e2830251a063935ab464256defe22 Mon Sep 17 00:00:00 2001
+From: Johannes Berg <johannes.berg@intel.com>
+Date: Wed, 5 Oct 2022 15:10:09 +0200
+Subject: wifi: mac80211_hwsim: avoid mac80211 warning on bad rate
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Johannes Berg <johannes.berg@intel.com>
+
+commit 1833b6f46d7e2830251a063935ab464256defe22 upstream.
+
+If the tool on the other side (e.g. wmediumd) gets confused
+about the rate, we hit a warning in mac80211. Silence that
+by effectively duplicating the check here and dropping the
+frame silently (in mac80211 it's dropped with the warning).
+
+Reported-by: Sönke Huster <shuster@seemoo.tu-darmstadt.de>
+Tested-by: Sönke Huster <shuster@seemoo.tu-darmstadt.de>
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/wireless/mac80211_hwsim.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/net/wireless/mac80211_hwsim.c
++++ b/drivers/net/wireless/mac80211_hwsim.c
+@@ -3011,6 +3011,8 @@ static int hwsim_cloned_frame_received_n
+ 
+       rx_status.band = data2->channel->band;
+       rx_status.rate_idx = nla_get_u32(info->attrs[HWSIM_ATTR_RX_RATE]);
++      if (rx_status.rate_idx >= data2->hw->wiphy->bands[rx_status.band]->n_bitrates)
++              goto out;
+       rx_status.signal = nla_get_u32(info->attrs[HWSIM_ATTR_SIGNAL]);
+ 
+       memcpy(IEEE80211_SKB_RXCB(skb), &rx_status, sizeof(rx_status));