| Message ID | 20211208061752.16564-1-quic_wgong@quicinc.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 3bf2537ec2e33310b431b53fd84be8833736c256 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [v2] ath10k: drop beacon and probe response which leak from other channel | expand |
Wen Gong <quic_wgong@quicinc.com> writes: > When scan request on channel 1, it also receive beacon from other > channels, and the beacon also indicate to mac80211 and wpa_supplicant, > and then the bss info appears in radio measurement report of radio > measurement sent from wpa_supplicant, thus lead RRM case fail. > > This is to drop the beacon and probe response which is not the same > channel of scanning. > > Tested-on: QCA6174 hw3.2 SDIO WLAN.RMH.4.4.1-00049 > > Signed-off-by: Wen Gong <quic_wgong@quicinc.com> > --- > v2: rebased to ath.git ath-202112071521 > > drivers/net/wireless/ath/ath10k/wmi.c | 28 ++++++++++++++++++++++++++- > 1 file changed, 27 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c > index 7c1c2658cb5f..07764ee409fe 100644 > --- a/drivers/net/wireless/ath/ath10k/wmi.c > +++ b/drivers/net/wireless/ath/ath10k/wmi.c > @@ -2610,10 +2610,32 @@ int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb) > if (ieee80211_is_beacon(hdr->frame_control)) > ath10k_mac_handle_beacon(ar, skb); > > + This caused a new warning: drivers/net/wireless/ath/ath10k/wmi.c:2613: Please don't use multiple blank lines Fixed in the pending branch.
Wen Gong <quic_wgong@quicinc.com> wrote: > When scan request on channel 1, it also receive beacon from other > channels, and the beacon also indicate to mac80211 and wpa_supplicant, > and then the bss info appears in radio measurement report of radio > measurement sent from wpa_supplicant, thus lead RRM case fail. > > This is to drop the beacon and probe response which is not the same > channel of scanning. > > Tested-on: QCA6174 hw3.2 SDIO WLAN.RMH.4.4.1-00049 > > Signed-off-by: Wen Gong <quic_wgong@quicinc.com> > Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> Patch applied to ath-next branch of ath.git, thanks. 3bf2537ec2e3 ath10k: drop beacon and probe response which leak from other channel
diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c index 7c1c2658cb5f..07764ee409fe 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.c +++ b/drivers/net/wireless/ath/ath10k/wmi.c @@ -2610,10 +2610,32 @@ int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb) if (ieee80211_is_beacon(hdr->frame_control)) ath10k_mac_handle_beacon(ar, skb); + if (ieee80211_is_beacon(hdr->frame_control) || - ieee80211_is_probe_resp(hdr->frame_control)) + ieee80211_is_probe_resp(hdr->frame_control)) { + struct ieee80211_mgmt *mgmt = (void *)skb->data; + u8 *ies; + int ies_ch; + status->boottime_ns = ktime_get_boottime_ns(); + if (!ar->scan_channel) + goto drop; + + ies = mgmt->u.beacon.variable; + + ies_ch = cfg80211_get_ies_channel_number(mgmt->u.beacon.variable, + skb_tail_pointer(skb) - ies, + sband->band); + + if (ies_ch > 0 && ies_ch != channel) { + ath10k_dbg(ar, ATH10K_DBG_MGMT, + "channel mismatched ds channel %d scan channel %d\n", + ies_ch, channel); + goto drop; + } + } + ath10k_dbg(ar, ATH10K_DBG_MGMT, "event mgmt rx skb %pK len %d ftype %02x stype %02x\n", skb, skb->len, @@ -2627,6 +2649,10 @@ int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb) ieee80211_rx_ni(ar->hw, skb); return 0; + +drop: + dev_kfree_skb(skb); + return 0; } static int freq_to_idx(struct ath10k *ar, int freq)
When scan request on channel 1, it also receive beacon from other channels, and the beacon also indicate to mac80211 and wpa_supplicant, and then the bss info appears in radio measurement report of radio measurement sent from wpa_supplicant, thus lead RRM case fail. This is to drop the beacon and probe response which is not the same channel of scanning. Tested-on: QCA6174 hw3.2 SDIO WLAN.RMH.4.4.1-00049 Signed-off-by: Wen Gong <quic_wgong@quicinc.com> --- v2: rebased to ath.git ath-202112071521 drivers/net/wireless/ath/ath10k/wmi.c | 28 ++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) base-commit: 4f4f8aee394b73abf5e5f98c63187fdbf1d627f0