Changeset e71c023 in mainline

Timestamp:

2018-08-03T16:56:31Z (7 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

02246b8

Parents:

3767bdb

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-08-03 16:32:18)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-08-03 16:56:31)

Message:

Fix stack corruption in ieee80211 (courtesy of hosted mode diagnostics).

Location:

uspace/lib/ieee80211

Files:

• include/ieee80211_private.h (modified) (1 diff)
• src/ieee80211.c (modified) (1 diff)

uspace/lib/ieee80211/include/ieee80211_private.h

@@ -98 +98 @@
 
 /** Special room in header reserved for encryption. */
-typedef enum {
-        IEEE80211_TKIP_HEADER_LENGTH = 8,
-        IEEE80211_CCMP_HEADER_LENGTH = 8
-} ieee80211_encrypt_header_reserve_length_t;
+#define IEEE80211_TKIP_HEADER_LENGTH 8
+#define IEEE80211_CCMP_HEADER_LENGTH 8
 
 /** IEEE 802.11 PTK key length. */
-typedef enum {
-        IEEE80211_PTK_CCMP_LENGTH = 48,
-        IEEE80211_PTK_TKIP_LENGTH = 64
-} ieee80211_ptk_length_t;
+#define IEEE80211_PTK_CCMP_LENGTH 48
+#define IEEE80211_PTK_TKIP_LENGTH 64
 
 /** IEEE 802.11 GTK key length. */
-typedef enum {
-        IEEE80211_GTK_CCMP_LENGTH = 16,
-        IEEE80211_GTK_TKIP_LENGTH = 32
-} ieee80211_gtk_length_t;
+#define IEEE80211_GTK_CCMP_LENGTH 16
+#define IEEE80211_GTK_TKIP_LENGTH 32
 
 /** IEEE 802.11 frame types. */

uspace/lib/ieee80211/src/ieee80211.c

@@ -571 +571 @@
         /* Init crypto data. */
         bool add_mic = false;
+        const size_t max_head_space = max(IEEE80211_TKIP_HEADER_LENGTH,
+            IEEE80211_CCMP_HEADER_LENGTH);
         size_t head_space = 0, mic_space = 0;
         uint16_t crypto = 0;
-        uint8_t head_data[head_space];
-        memset(head_data, 0, head_space);
+        uint8_t head_data[max_head_space];
+        memset(head_data, 0, max_head_space);
 
         // TODO: Distinguish used key (pair/group) by dest address ?