From 8421e95c712e10fca768ee8bfe3d334cba6a9d12 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 5 Sep 2010 12:47:16 +0300 Subject: [PATCH] Fix segfault in hostapd_eid_ht_capabilities() with some drivers This function is not really needed in case of drivers that build the HT IEs internally. However, since this can get called if ieee80211n=1 is set in hostapd.conf, we better not segfault even if the driver does not provide hw info (hapd->iface->current_mode == NULL). --- src/ap/ieee802_11_ht.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ap/ieee802_11_ht.c b/src/ap/ieee802_11_ht.c index b193ee08c..7541b8381 100644 --- a/src/ap/ieee802_11_ht.c +++ b/src/ap/ieee802_11_ht.c @@ -30,7 +30,7 @@ u8 * hostapd_eid_ht_capabilities(struct hostapd_data *hapd, u8 *eid) struct ieee80211_ht_capabilities *cap; u8 *pos = eid; - if (!hapd->iconf->ieee80211n) + if (!hapd->iconf->ieee80211n || !hapd->iface->current_mode) return eid; *pos++ = WLAN_EID_HT_CAP;