From 4fba48a5a7d367e86cdd29b6f004dcdb63e6b279 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Thu, 5 Jun 2008 17:50:53 +0300 Subject: [PATCH] Silence compiler warnings about out of array bounds indexes struct wpa_ie_hdr had separate fields for 24-bit OUI and 8-bit oui_type for WPA/RSN selectors. {WPA,RSN}_SELECTOR_{GET,PUT} access these four octets through oui and the "out-of-bounds" access for the fourth octet is actually reading/writing oui_type. This works fine, but some tools complain about the array bounds "failure". Since oui_type is never accessed separately, the simplest fix is to just combine these into a single 4-octet field. --- src/common/wpa_common.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h index 936df73e3..9b9e39e35 100644 --- a/src/common/wpa_common.h +++ b/src/common/wpa_common.h @@ -188,8 +188,7 @@ struct wpa_ptk { struct wpa_ie_hdr { u8 elem_id; u8 len; - u8 oui[3]; - u8 oui_type; + u8 oui[4]; /* 24-bit OUI followed by 8-bit OUI type */ u8 version[2]; /* little endian */ } STRUCT_PACKED;