summaryrefslogtreecommitdiff
path: root/sys/net80211
diff options
context:
space:
mode:
authorDamien Bergamini <damien@cvs.openbsd.org>2010-06-14 17:39:21 +0000
committerDamien Bergamini <damien@cvs.openbsd.org>2010-06-14 17:39:21 +0000
commit55b600468dcca918ab131bd192cbfc6f9ac8706b (patch)
treeca8699bdc22249bf13cddd00d9730476055bdcbf /sys/net80211
parent6404f437492509dfc5f56c068e074d75040d9e8d (diff)
do not try to associate with an AP using an unsupported group cipher,
otherwise we will panic in ieee80211_add_rsn_body(). this may be the cause of a panic seen by reyk@ though i'm not 100% sure.
Diffstat (limited to 'sys/net80211')
-rw-r--r--sys/net80211/ieee80211_node.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c
index d7214aebbb8..cb8082543b8 100644
--- a/sys/net80211/ieee80211_node.c
+++ b/sys/net80211/ieee80211_node.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_node.c,v 1.57 2010/03/28 13:02:58 krw Exp $ */
+/* $OpenBSD: ieee80211_node.c,v 1.58 2010/06/14 17:39:20 damien Exp $ */
/* $NetBSD: ieee80211_node.c,v 1.14 2004/05/09 09:18:47 dyoung Exp $ */
/*-
@@ -439,6 +439,9 @@ ieee80211_match_bss(struct ieee80211com *ic, struct ieee80211_node *ni)
if (!(ic->ic_flags & IEEE80211_F_PSK))
fail |= 0x40;
}
+ if (ni->ni_rsngroupcipher == IEEE80211_CIPHER_NONE ||
+ ni->ni_rsngroupcipher == IEEE80211_CIPHER_USEGROUP)
+ fail |= 0x40;
if ((ni->ni_rsnciphers & ic->ic_rsnciphers) == 0)
fail |= 0x40;