mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-27 11:13:24 +02:00
ee2e7db90b
https://lists.ipfire.org/pipermail/development/2022-October/014562.html Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
From fff244e9171b2ca692469d41c68b36607bd73ab0 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] wifi: mac80211_hwsim: avoid mac80211 warning on bad rate
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=utf8
|
|
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 52a2574b7d13..b228567b2a73 100644
|
|
--- a/drivers/net/wireless/mac80211_hwsim.c
|
|
+++ b/drivers/net/wireless/mac80211_hwsim.c
|
|
@@ -3749,6 +3749,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.30.2
|
|
|