From 4a393fe9f8191109a715fb1d4916fbf852530125 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Wed, 24 Dec 2014 18:40:25 +0200 Subject: [PATCH] WPS: Do not indicate PBC overlap for the same BSS Even if the UUID would have a mismatch, e.g., due to no UUID known for the target in a new WPS PBC instance, do not indicate PBC session overlap if the BSSID is same in the two entries. This should not really happen in normal use cases, but can happen at least in some test scenarios where the same BSSID is used in consecutive test cases and the old BSS entry remains in cfg80211 cache. Signed-off-by: Jouni Malinen --- wpa_supplicant/wps_supplicant.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wpa_supplicant/wps_supplicant.c b/wpa_supplicant/wps_supplicant.c index 0359cde9f..ebbb798b9 100644 --- a/wpa_supplicant/wps_supplicant.c +++ b/wpa_supplicant/wps_supplicant.c @@ -1706,6 +1706,10 @@ int wpas_wps_scan_pbc_overlap(struct wpa_supplicant *wpa_s, uuid = wps_get_uuid_e(ie); wpa_hexdump(MSG_DEBUG, "WPS: UUID of the other BSS", uuid, UUID_LEN); + if (os_memcmp(selected->bssid, bss->bssid, ETH_ALEN) == 0) { + wpabuf_free(ie); + continue; + } if (sel_uuid == NULL || uuid == NULL || os_memcmp(sel_uuid, uuid, UUID_LEN) != 0) { ret = 1; /* PBC overlap */