summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMichael Knudsen <mk@cvs.openbsd.org>2008-10-23 16:21:22 +0000
committerMichael Knudsen <mk@cvs.openbsd.org>2008-10-23 16:21:22 +0000
commit32e4f7d89758560b47521a0c802e5c1391c0af6e (patch)
treef80396db2c9d3e04e697da5f9e7214a1170cca2b /sys
parent8488144a3b65f77a54141d5e9ec5fcc050586ede (diff)
Prevent a crash in ieee80211_setkeys() when unplugging an interface in
hostap mode by canceling the group rekey timeout in ieee80211_node_detach(). ok damien
Diffstat (limited to 'sys')
-rw-r--r--sys/net80211/ieee80211_node.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c
index 50116a14b75..0eb7cb3064a 100644
--- a/sys/net80211/ieee80211_node.c
+++ b/sys/net80211/ieee80211_node.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_node.c,v 1.47 2008/10/15 19:12:18 blambert Exp $ */
+/* $OpenBSD: ieee80211_node.c,v 1.48 2008/10/23 16:21:21 mk Exp $ */
/* $NetBSD: ieee80211_node.c,v 1.14 2004/05/09 09:18:47 dyoung Exp $ */
/*-
@@ -178,6 +178,8 @@ ieee80211_node_detach(struct ifnet *ifp)
free(ic->ic_aid_bitmap, M_DEVBUF);
if (ic->ic_tim_bitmap != NULL)
free(ic->ic_tim_bitmap, M_DEVBUF);
+
+ timeout_del(&ic->ic_rsn_timeout);
}
/*