DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

HT: Use cleaner way of generating pointer to a field (CID 68097)

Browse source 
The Action code field is in a fixed location, so the IEEE80211_HDRLEN
can be used here to clean up bounds checking to avoid false reports from
static analyzer.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-06-12 21:46:30 +03:00
parent fb5d417178
commit 5ce3ae4c8f
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ap/ieee802_11_ht.c
View file

@ -211,8 +211,7 @@ void hostapd_2040_coex_action(struct hostapd_data *hapd,
struct ieee80211_2040_intol_chan_report *ic_report; struct ieee80211_2040_intol_chan_report *ic_report;
int is_ht_allowed = 1; int is_ht_allowed = 1;
int i; int i;
const u8 *data = (const u8 *) &mgmt->u.action.u.public_action.action; const u8 *data = ((const u8 *) mgmt) + 1;
size_t hdr_len;
hostapd_logger(hapd, mgmt->sa, HOSTAPD_MODULE_IEEE80211, hostapd_logger(hapd, mgmt->sa, HOSTAPD_MODULE_IEEE80211,
HOSTAPD_LEVEL_DEBUG, "hostapd_public_action - action=%d", HOSTAPD_LEVEL_DEBUG, "hostapd_public_action - action=%d",
@ -221,8 +220,7 @@ void hostapd_2040_coex_action(struct hostapd_data *hapd,
if (!(iface->conf->ht_capab & HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET)) if (!(iface->conf->ht_capab & HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET))
return; return;
hdr_len = data - (u8 *) mgmt; if (len < IEEE80211_HDRLEN + 1)
if (hdr_len > len)
return; return;
data++; data++;