P2PS: Do not reply to ProbeReq on another channel when starting Listen

It was possible for the P2PS Probe Response frame to go out on the
channel on which a Probe Request frame was reported even when we are
just about to start Listen mode on another channel. This could result in
the peer device using incorrect channel for us. Fix this by skipping the
response in this special case while waiting for Listen mode to start.

This showed up as a hwsim test failure with test sequence "gas_fragment
p2ps_connect_display_method_nonautoaccept" in cases where the dev[0]
Listen channel was not same as the AP operating frequency in the GAS
test.

Signed-off-by: Jouni Malinen <j@w1.fi>

diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c
index c9c3ec2dbbbfbc326ee2aed4eb77930ff82632ca..b87ff96b88abddb0bae509b7320920dd38b9679f 100644 (file)
--- a/src/p2p/p2p.c
+++ b/src/p2p/p2p.c
@@ -2315,6 +2315,19 @@ p2p_reply_probe(struct p2p_data *p2p, const u8 *addr, const u8 *dst,
                u8 i;
                int p2ps_svc_found = 0;
 
+               p2p_dbg(p2p, "in_listen=%d drv_in_listen=%d when received P2PS Probe Request at %u MHz; own Listen channel %u, pending listen freq %u MHz",
+                       p2p->in_listen, p2p->drv_in_listen, rx_freq,
+                       p2p->cfg->channel, p2p->pending_listen_freq);
+
+               if (!p2p->in_listen && !p2p->drv_in_listen &&
+                   p2p->pending_listen_freq && rx_freq &&
+                   rx_freq != p2p->pending_listen_freq) {
+                       p2p_dbg(p2p, "Do not reply to Probe Request frame that was received on %u MHz while waiting to start Listen state on %u MHz",
+                               rx_freq, p2p->pending_listen_freq);
+                       p2p_parse_free(&msg);
+                       return P2P_PREQ_NOT_LISTEN;
+               }
+
                for (i = 0; i < msg.service_hash_count; i++) {
                        if (p2p_service_find_asp(p2p, hash)) {
                                p2p_dbg(p2p, "Service Hash match found: "