From: Greg Kroah-Hartman Date: Thu, 13 Oct 2022 16:56:43 +0000 (+0200) Subject: 4.19-stable patches X-Git-Tag: v5.4.218~17 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=98834ec5de75e1c5c4248876dbe7fcc252550878;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: wifi-mac80211_hwsim-avoid-mac80211-warning-on-bad-rate.patch --- diff --git a/queue-4.19/series b/queue-4.19/series index dc1be8e8a4d..d21c5b1c747 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -26,3 +26,4 @@ usb-serial-qcserial-add-new-usb-id-for-dell-branded-em7455.patch random-restore-o_nonblock-support.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.19/wifi-mac80211_hwsim-avoid-mac80211-warning-on-bad-rate.patch b/queue-4.19/wifi-mac80211_hwsim-avoid-mac80211-warning-on-bad-rate.patch new file mode 100644 index 00000000000..218ed1a50a0 --- /dev/null +++ b/queue-4.19/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 +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 + +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 +Tested-by: Sönke Huster +Signed-off-by: Johannes Berg +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -3270,6 +3270,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));