WPS: Use only UUID-E in PBC session overlap detection on Registrar

Ignore possible mismatches in the source address of the frame and only
use UUID-E to check whether a Probe Request or M1 is from the same
Enrollee when figuring out whether there is PBC session overlap. This
is needed to avoid potential issues with Enrollee devices that may have
multiple interfaces indicating active PBC state.

diff --git a/src/wps/wps_registrar.c b/src/wps/wps_registrar.c
index a01066c7723ddc2d3f8f196d32768013583a5ac2..e7f1a9ac7b812e48a21299bde11f2e6ed27060d5 100644 (file)
--- a/src/wps/wps_registrar.c
+++ b/src/wps/wps_registrar.c
@@ -336,6 +336,7 @@ int wps_registrar_pbc_overlap(struct wps_registrar *reg,
 {
        int count = 0;
        struct wps_pbc_session *pbc;
+       struct wps_pbc_session *first = NULL;
        struct os_time now;
 
        os_get_time(&now);
@@ -343,13 +344,19 @@ int wps_registrar_pbc_overlap(struct wps_registrar *reg,
        for (pbc = reg->pbc_sessions; pbc; pbc = pbc->next) {
                if (now.sec > pbc->timestamp.sec + WPS_PBC_WALK_TIME)
                        break;
-               if (addr == NULL || os_memcmp(addr, pbc->addr, ETH_ALEN) ||
-                   uuid_e == NULL ||
+               if (first &&
+                   os_memcmp(pbc->uuid_e, first->uuid_e, WPS_UUID_LEN) == 0)
+                       continue; /* same Enrollee */
+               if (uuid_e == NULL ||
                    os_memcmp(uuid_e, pbc->uuid_e, WPS_UUID_LEN))
                        count++;
+               if (first == NULL)
+                       first = pbc;
        }
 
-       if (addr || uuid_e)
+       if (uuid_e &&
+           (first == NULL ||
+            os_memcmp(uuid_e, first->uuid_e, WPS_UUID_LEN) != 0))
                count++;
 
        return count > 1 ? 1 : 0;