Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 965923b8 authored by Johannes Berg's avatar Johannes Berg Committed by Greg Kroah-Hartman
Browse files

wifi: mac80211_hwsim: avoid mac80211 warning on bad rate 



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: default avatarSönke Huster <shuster@seemoo.tu-darmstadt.de>
Tested-by: default avatarSönke Huster <shuster@seemoo.tu-darmstadt.de>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 40d0a9fe

drivers/net/wireless/mac80211_hwsim.c

+2 −0
Original line number Diff line number Diff line
@@ -3270,6 +3270,8 @@ static int hwsim_cloned_frame_received_nl(struct sk_buff *skb_2, 


	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));