summarylogtreecommitdiffstats
path: root/0010-wifi-mac80211_hwsim-avoid-mac80211-warning-on-bad-ra.patch
diff options
context:
space:
mode:
authorgraysky2022-10-14 05:13:33 -0400
committergraysky2022-10-14 05:13:33 -0400
commiteac1e41745ffa9f881f99deba886e2da1095dc8b (patch)
tree8e547aee066d654d63c81bfadeec402f654691e9 /0010-wifi-mac80211_hwsim-avoid-mac80211-warning-on-bad-ra.patch
parentc605c9da9642e684485a2563e6ca5b940171fdc8 (diff)
downloadaur-eac1e41745ffa9f881f99deba886e2da1095dc8b.tar.gz
Update to 6.0.1-2
Diffstat (limited to '0010-wifi-mac80211_hwsim-avoid-mac80211-warning-on-bad-ra.patch')
-rw-r--r--0010-wifi-mac80211_hwsim-avoid-mac80211-warning-on-bad-ra.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/0010-wifi-mac80211_hwsim-avoid-mac80211-warning-on-bad-ra.patch b/0010-wifi-mac80211_hwsim-avoid-mac80211-warning-on-bad-ra.patch
new file mode 100644
index 000000000000..cc74abec1f9a
--- /dev/null
+++ b/0010-wifi-mac80211_hwsim-avoid-mac80211-warning-on-bad-ra.patch
@@ -0,0 +1,40 @@
+From dffea9220217da59cb0621d7291708255e059699 Mon Sep 17 00:00:00 2001
+From: Johannes Berg <johannes.berg@intel.com>
+Date: Wed, 5 Oct 2022 15:10:09 +0200
+Subject: [PATCH 10/13] wifi: mac80211_hwsim: avoid mac80211 warning on bad
+ rate
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+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(+)
+
+diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
+index 1f301a5fb396..ee34814bd12b 100644
+--- a/drivers/net/wireless/mac80211_hwsim.c
++++ b/drivers/net/wireless/mac80211_hwsim.c
+@@ -4526,6 +4526,8 @@ static int hwsim_cloned_frame_received_nl(struct sk_buff *skb_2,
+
+ rx_status.band = 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]);
+
+ hdr = (void *)skb->data;
+--
+2.38.0
+