git.openwrt.org Git - openwrt/staging/jow.git/blob

   1 From: Johannes Berg <johannes.berg@intel.com>
   2 Date: Wed, 5 Oct 2022 15:10:09 +0200
   3 Subject: [PATCH] wifi: mac80211_hwsim: avoid mac80211 warning on bad
   4  rate
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 commit 1833b6f46d7e2830251a063935ab464256defe22 upstream.
  10
  11 If the tool on the other side (e.g. wmediumd) gets confused
  12 about the rate, we hit a warning in mac80211. Silence that
  13 by effectively duplicating the check here and dropping the
  14 frame silently (in mac80211 it's dropped with the warning).
  15
  16 Reported-by: Sönke Huster <shuster@seemoo.tu-darmstadt.de>
  17 Tested-by: Sönke Huster <shuster@seemoo.tu-darmstadt.de>
  18 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  19 ---
  20
  21 --- a/drivers/net/wireless/mac80211_hwsim.c
  22 +++ b/drivers/net/wireless/mac80211_hwsim.c
  23 @@ -3760,6 +3760,8 @@ static int hwsim_cloned_frame_received_n
  24
  25         rx_status.band = channel->band;
  26         rx_status.rate_idx = nla_get_u32(info->attrs[HWSIM_ATTR_RX_RATE]);
  27 +       if (rx_status.rate_idx >= data2->hw->wiphy->bands[rx_status.band]->n_bitrates)
  28 +               goto out;
  29         rx_status.signal = nla_get_u32(info->attrs[HWSIM_ATTR_SIGNAL]);
  30
  31         hdr = (void *)skb->data;