Check both sec and usec values to see if MAC address was changed

wpa_s->last_mac_addr_change.sec might be zero in the special case of UML
testing with time travel since it would be possible to complete the test
case steps within one second of the system start.

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

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 370668a30ee2b3b4ef52a3d9cf391f620b8e6a18..5bf1f542d10cda9394b89b77f7ef69480406390a 100644 (file)
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -2246,7 +2246,8 @@ int wpas_update_random_addr(struct wpa_supplicant *wpa_s, int style,
                        if (os_memcmp(wpa_s->own_addr, ssid->mac_value,
                                      ETH_ALEN) == 0)
                                return 0;
-               } else if (wpa_s->last_mac_addr_change.sec != 0 &&
+               } else if ((wpa_s->last_mac_addr_change.sec != 0 ||
+                           wpa_s->last_mac_addr_change.usec != 0) &&
                           !os_reltime_expired(
                                   &now,
                                   &wpa_s->last_mac_addr_change,