From f56877414cf3349df304ce7d300e08ff31fa86b7 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Tue, 3 Jan 2017 00:21:11 +0200 Subject: [PATCH] Do not add own BSS in neighbor report with invalid op_class/channel Verify that ieee80211_freq_to_channel_ext() succeeds before adding the own BSS in the neighbor report. Signed-off-by: Jouni Malinen --- src/ap/hostapd.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c index 9f972ae24..26ebbb666 100644 --- a/src/ap/hostapd.c +++ b/src/ap/hostapd.c @@ -1603,10 +1603,12 @@ static void hostapd_set_own_neighbor_report(struct hostapd_data *hapd) /* TODO: Set NEI_REP_BSSID_INFO_MOBILITY_DOMAIN if MDE is set */ - ieee80211_freq_to_channel_ext(hapd->iface->freq, - hapd->iconf->secondary_channel, - hapd->iconf->vht_oper_chwidth, - &op_class, &channel); + if (ieee80211_freq_to_channel_ext(hapd->iface->freq, + hapd->iconf->secondary_channel, + hapd->iconf->vht_oper_chwidth, + &op_class, &channel) == + NUM_HOSTAPD_MODES) + return; width = hostapd_get_nr_chan_width(hapd, ht, vht); if (vht) { center_freq1_idx = hapd->iconf->vht_oper_centr_freq_seg0_idx;