Fix PeerKey deinit behavior

PeerKey entries need to be removed on disassociation and this needs to
be done in a way that cancels the possibly pending eloop timeout.

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

diff --git a/src/rsn_supp/peerkey.c b/src/rsn_supp/peerkey.c
index 76714f8df5d5cacc892a30bf9518984eff3deff3..cb86dfbcc4a66320385f57a61f5e259684283115 100644 (file)
--- a/src/rsn_supp/peerkey.c
+++ b/src/rsn_supp/peerkey.c
@@ -1110,7 +1110,7 @@ void peerkey_deinit(struct wpa_sm *sm)
        while (peerkey) {
                prev = peerkey;
                peerkey = peerkey->next;
-               os_free(prev);
+               wpa_supplicant_peerkey_free(sm, prev);
        }
        sm->peerkey = NULL;
 }

diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
index 109d07bed4790f390c1bd116864a0485fa33c76f..d26a7a8b08e7afe2d3f1acd7dfbf85c254d748b5 100644 (file)
--- a/src/rsn_supp/wpa.c
+++ b/src/rsn_supp/wpa.c
@@ -2098,6 +2098,7 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid)
  */
 void wpa_sm_notify_disassoc(struct wpa_sm *sm)
 {
+       peerkey_deinit(sm);
        rsn_preauth_deinit(sm);
        pmksa_cache_clear_current(sm);
        if (wpa_sm_get_state(sm) == WPA_4WAY_HANDSHAKE)