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

Use clearer way of getting pointer to a frame (CID 62835)

Browse source 
This avoids an incorrect ARRAY_VS_SINGLETON report for a case where a
pointer is taken to the specified field in a frame and not to a single
octet. Bounds checking was already handled separately.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-06-12 19:42:50 +03:00
parent c02f35fb59
commit 70d9537361
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
wpa_supplicant/events.c
View file

@ -2788,9 +2788,9 @@ static void wpa_supplicant_update_channel_list(
static void wpas_event_rx_mgmt_action(struct wpa_supplicant *wpa_s, static void wpas_event_rx_mgmt_action(struct wpa_supplicant *wpa_s,
const struct ieee80211_mgmt *mgmt, const u8 *frame, size_t len, int freq)
size_t len, int freq)
{ {
const struct ieee80211_mgmt *mgmt;
const u8 *payload; const u8 *payload;
size_t plen; size_t plen;
u8 category; u8 category;
@ -2798,9 +2798,10 @@ static void wpas_event_rx_mgmt_action(struct wpa_supplicant *wpa_s,
if (len < IEEE80211_HDRLEN + 2) if (len < IEEE80211_HDRLEN + 2)
return; return;
payload = &mgmt->u.action.category; mgmt = (const struct ieee80211_mgmt *) frame;
payload = frame + IEEE80211_HDRLEN;
category = *payload++; category = *payload++;
plen = (((const u8 *) mgmt) + len) - payload; plen = len - IEEE80211_HDRLEN - 1;
wpa_dbg(wpa_s, MSG_DEBUG, "Received Action frame: SA=" MACSTR wpa_dbg(wpa_s, MSG_DEBUG, "Received Action frame: SA=" MACSTR
" Category=%u DataLen=%d freq=%d MHz", " Category=%u DataLen=%d freq=%d MHz",
@ -3223,7 +3224,8 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
if (stype == WLAN_FC_STYPE_ACTION) { if (stype == WLAN_FC_STYPE_ACTION) {
wpas_event_rx_mgmt_action( wpas_event_rx_mgmt_action(
wpa_s, mgmt, data->rx_mgmt.frame_len, wpa_s, data->rx_mgmt.frame,
data->rx_mgmt.frame_len,
data->rx_mgmt.freq); data->rx_mgmt.freq);
break; break;
} }