Merge pull request #340 from pbrochart/realtek-4.4.x

fix UBSAN: array-index-out-of-bounds
This commit is contained in:
Carlos Garcés 2024-05-07 17:59:33 +02:00 committed by GitHub
commit 27410641da
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions

View File

@ -310,7 +310,7 @@ struct ieee_param {
struct { struct {
u32 len; u32 len;
u8 reserved[32]; u8 reserved[32];
u8 data[0]; u8 data[];
} wpa_ie; } wpa_ie;
struct { struct {
int command; int command;
@ -323,7 +323,7 @@ struct ieee_param {
u8 idx; u8 idx;
u8 seq[8]; /* sequence counter (set: RX, get: TX) */ u8 seq[8]; /* sequence counter (set: RX, get: TX) */
u16 key_len; u16 key_len;
u8 key[0]; u8 key[];
} crypt; } crypt;
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
struct { struct {
@ -335,7 +335,7 @@ struct ieee_param {
} add_sta; } add_sta;
struct { struct {
u8 reserved[2];/* for set max_num_sta */ u8 reserved[2];/* for set max_num_sta */
u8 buf[0]; u8 buf[];
} bcn_ie; } bcn_ie;
#endif #endif
@ -346,7 +346,7 @@ struct ieee_param {
struct ieee_param_ex { struct ieee_param_ex {
u32 cmd; u32 cmd;
u8 sta_addr[ETH_ALEN]; u8 sta_addr[ETH_ALEN];
u8 data[0]; u8 data[];
}; };
struct sta_data { struct sta_data {
@ -711,7 +711,7 @@ extern struct rate_section_ent rates_by_sections[];
struct ieee80211_info_element { struct ieee80211_info_element {
u8 id; u8 id;
u8 len; u8 len;
u8 data[0]; u8 data[];
} __attribute__((packed)); } __attribute__((packed));
/* /*

View File

@ -95,7 +95,7 @@ typedef struct _NDIS_802_11_FIXED_IEs {
typedef struct _NDIS_802_11_VARIABLE_IEs { typedef struct _NDIS_802_11_VARIABLE_IEs {
UCHAR ElementID; UCHAR ElementID;
UCHAR Length; UCHAR Length;
UCHAR data[1]; UCHAR data[];
} NDIS_802_11_VARIABLE_IEs, *PNDIS_802_11_VARIABLE_IEs; } NDIS_802_11_VARIABLE_IEs, *PNDIS_802_11_VARIABLE_IEs;