diff options
| author | adrian <adrian@FreeBSD.org> | 2012-09-16 22:45:00 +0000 |
|---|---|---|
| committer | adrian <adrian@FreeBSD.org> | 2012-09-16 22:45:00 +0000 |
| commit | 3ee466e6fc0755bf36f9f2c1865d5b95d9c5baae (patch) | |
| tree | 6e726feeb6ed49d129ec97b993ef77fea5bdeee2 /sys/net80211/ieee80211_node.c | |
| parent | e86254d4535fdd037eb84feaab10a54926d4c128 (diff) | |
| download | FreeBSD-src-3ee466e6fc0755bf36f9f2c1865d5b95d9c5baae.zip FreeBSD-src-3ee466e6fc0755bf36f9f2c1865d5b95d9c5baae.tar.gz | |
Fix a crash bug introduced in the iterate node work recently done.
When resuming, the first VAP is checked for max_aid; however if there
is no VAP, this results in a NULL pointer dereference and kernel
panic.
Diffstat (limited to 'sys/net80211/ieee80211_node.c')
| -rw-r--r-- | sys/net80211/ieee80211_node.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index 27efa87..7ed3523 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -2245,8 +2245,16 @@ ieee80211_iterate_nodes(struct ieee80211_node_table *nt, size_t size; int i; uint16_t max_aid; + struct ieee80211vap *vap; + + /* Overdoing it default */ + max_aid = IEEE80211_AID_MAX; + + /* Handle the case of there being no vaps just yet */ + vap = TAILQ_FIRST(&nt->nt_ic->ic_vaps); + if (vap != NULL) + max_aid = vap->iv_max_aid; - max_aid = TAILQ_FIRST(&nt->nt_ic->ic_vaps)->iv_max_aid; size = max_aid * sizeof(struct ieee80211_node *); ni_arr = (struct ieee80211_node **) malloc(size, M_80211_NODE, M_NOWAIT | M_ZERO); |
