treewide: Replace 0-element memcpy() destinations with flexible arrays

The 0-element arrays that are used as memcpy() destinations are actually
flexible arrays. Adjust their structures accordingly so that memcpy()
can better reason able their destination size (i.e. they need to be seen
as "unknown" length rather than "zero").

In some cases, use of the DECLARE_FLEX_ARRAY() helper is needed when a
flexible array is alone in a struct.

Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Kalle Valo <kvalo@codeaurora.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Nilesh Javali <njavali@marvell.com>
Cc: Manish Rangankar <mrangankar@marvell.com>
Cc: GR-QLogic-Storage-Upstream@marvell.com
Cc: "James E.J. Bottomley" <jejb@linux.ibm.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Phillip Potter <phil@philpotter.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: Fabio Aiuto <fabioaiuto83@gmail.com>
Cc: Ross Schmidt <ross.schm.dev@gmail.com>
Cc: Marco Cesati <marcocesati@gmail.com>
Cc: ath10k@lists.infradead.org
Cc: linux-wireless@vger.kernel.org
Cc: netdev@vger.kernel.org
Cc: linux-scsi@vger.kernel.org
Cc: linux-staging@lists.linux.dev
Signed-off-by: Kees Cook <keescook@chromium.org>

diff --git a/drivers/net/wireless/ath/ath10k/bmi.h b/drivers/net/wireless/ath/ath10k/bmi.h
index f6fadcbdd86ef0cac16468240bbbaf89813645b2..0685c0d2d4ea035c11932facb91bb81a91ac58fb 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/bmi.h
+++ b/drivers/net/wireless/ath/ath10k/bmi.h
@@ -109,7 +109,7 @@ struct bmi_cmd {
                struct {
                        __le32 addr;
                        __le32 len;
-                       u8 payload[0];
+                       u8 payload[];
                } write_mem;
                struct {
                        __le32 addr;
@@ -138,18 +138,18 @@ struct bmi_cmd {
                } rompatch_uninstall;
                struct {
                        __le32 count;
-                       __le32 patch_ids[0]; /* length of @count */
+                       __le32 patch_ids[]; /* length of @count */
                } rompatch_activate;
                struct {
                        __le32 count;
-                       __le32 patch_ids[0]; /* length of @count */
+                       __le32 patch_ids[]; /* length of @count */
                } rompatch_deactivate;
                struct {
                        __le32 addr;
                } lz_start;
                struct {
                        __le32 len; /* max BMI_MAX_DATA_SIZE */
-                       u8 payload[0]; /* length of @len */
+                       u8 payload[]; /* length of @len */
                } lz_data;
                struct {
                        u8 name[BMI_NVRAM_SEG_NAME_SZ];
@@ -160,7 +160,7 @@ struct bmi_cmd {
 
 union bmi_resp {
        struct {
-               u8 payload[0];
+               DECLARE_FLEX_ARRAY(u8, payload);
        } read_mem;
        struct {
                __le32 result;

diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
index 031569c496e57fd35b60fdd52fd8e8c1385cf471..69a590546bf94872a3cda9857a4f9a960ffefe3d 100644 (file)
--- a/drivers/scsi/qla4xxx/ql4_def.h
+++ b/drivers/scsi/qla4xxx/ql4_def.h
@@ -366,13 +366,13 @@ struct qla4_work_evt {
                struct {
                        enum iscsi_host_event_code code;
                        uint32_t data_size;
-                       uint8_t data[0];
+                       uint8_t data[];
                } aen;
                struct {
                        uint32_t status;
                        uint32_t pid;
                        uint32_t data_size;
-                       uint8_t data[0];
+                       uint8_t data[];
                } ping;
        } u;
 };

diff --git a/drivers/staging/r8188eu/include/ieee80211.h b/drivers/staging/r8188eu/include/ieee80211.h
index bc5b030e9c409b8b2025e0c25138dfbecadafe2e..9204dd42f319f845ff6bde213b7af349560918af 100644 (file)
--- a/drivers/staging/r8188eu/include/ieee80211.h
+++ b/drivers/staging/r8188eu/include/ieee80211.h
@@ -185,7 +185,7 @@ struct ieee_param {
                struct {
                        u32 len;
                        u8 reserved[32];
-                       u8 data[0];
+                       u8 data[];
                } wpa_ie;
                struct {
                        int command;
@@ -198,7 +198,7 @@ struct ieee_param {
                        u8 idx;
                        u8 seq[8]; /* sequence counter (set: RX, get: TX) */
                        u16 key_len;
-                       u8 key[0];
+                       u8 key[];
                } crypt;
 #ifdef CONFIG_88EU_AP_MODE
                struct {
@@ -210,7 +210,7 @@ struct ieee_param {
                } add_sta;
                struct {
                        u8      reserved[2];/* for set max_num_sta */
-                       u8      buf[0];
+                       u8      buf[];
                } bcn_ie;
 #endif
 

diff --git a/drivers/staging/rtl8712/ieee80211.h b/drivers/staging/rtl8712/ieee80211.h
index 61eff7c5746b7d5396df204692e322c91b094b5b..65ceaca9b51ea725e1947f041179c53080d06460 100644 (file)
--- a/drivers/staging/rtl8712/ieee80211.h
+++ b/drivers/staging/rtl8712/ieee80211.h
@@ -78,7 +78,7 @@ struct ieee_param {
                struct {
                        u32 len;
                        u8 reserved[32];
-                       u8 data[0];
+                       u8 data[];
                } wpa_ie;
                struct {
                        int command;
@@ -91,7 +91,7 @@ struct ieee_param {
                        u8 idx;
                        u8 seq[8]; /* sequence counter (set: RX, get: TX) */
                        u16 key_len;
-                       u8 key[0];
+                       u8 key[];
                } crypt;
        } u;
 };

diff --git a/drivers/staging/rtl8723bs/include/ieee80211.h b/drivers/staging/rtl8723bs/include/ieee80211.h
index d6236f5b069df4f4b247e78a70eaedca7e477f5a..c11d7e2d2347fa6757b9d2be5bbb19adef87f7cc 100644 (file)
--- a/drivers/staging/rtl8723bs/include/ieee80211.h
+++ b/drivers/staging/rtl8723bs/include/ieee80211.h
@@ -172,7 +172,7 @@ struct ieee_param {
                struct {
                        u32 len;
                        u8 reserved[32];
-                       u8 data[0];
+                       u8 data[];
                } wpa_ie;
                struct{
                        int command;
@@ -185,7 +185,7 @@ struct ieee_param {
                        u8 idx;
                        u8 seq[8]; /* sequence counter (set: RX, get: TX) */
                        u16 key_len;
-                       u8 key[0];
+                       u8 key[];
                } crypt;
                struct {
                        u16 aid;
@@ -196,7 +196,7 @@ struct ieee_param {
                } add_sta;
                struct {
                        u8 reserved[2];/* for set max_num_sta */
-                       u8 buf[0];
+                       u8 buf[];
                } bcn_ie;
        } u;
 };

diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 694264503119d4c394cc9868477856726044a9bd..ada3dd79cd083bfb1fa1dcbf645d2bd1465cd414 100644 (file)
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -1143,7 +1143,7 @@ struct ieee80211_mgmt {
                        __le16 auth_transaction;
                        __le16 status_code;
                        /* possibly followed by Challenge text */
-                       u8 variable[0];
+                       u8 variable[];
                } __packed auth;
                struct {
                        __le16 reason_code;
@@ -1152,26 +1152,26 @@ struct ieee80211_mgmt {
                        __le16 capab_info;
                        __le16 listen_interval;
                        /* followed by SSID and Supported rates */
-                       u8 variable[0];
+                       u8 variable[];
                } __packed assoc_req;
                struct {
                        __le16 capab_info;
                        __le16 status_code;
                        __le16 aid;
                        /* followed by Supported rates */
-                       u8 variable[0];
+                       u8 variable[];
                } __packed assoc_resp, reassoc_resp;
                struct {
                        __le16 capab_info;
                        __le16 status_code;
-                       u8 variable[0];
+                       u8 variable[];
                } __packed s1g_assoc_resp, s1g_reassoc_resp;
                struct {
                        __le16 capab_info;
                        __le16 listen_interval;
                        u8 current_ap[ETH_ALEN];
                        /* followed by SSID and Supported rates */
-                       u8 variable[0];
+                       u8 variable[];
                } __packed reassoc_req;
                struct {
                        __le16 reason_code;
@@ -1182,11 +1182,11 @@ struct ieee80211_mgmt {
                        __le16 capab_info;
                        /* followed by some of SSID, Supported rates,
                         * FH Params, DS Params, CF Params, IBSS Params, TIM */
-                       u8 variable[0];
+                       u8 variable[];
                } __packed beacon;
                struct {
                        /* only variable items: SSID, Supported rates */
-                       u8 variable[0];
+                       DECLARE_FLEX_ARRAY(u8, variable);
                } __packed probe_req;
                struct {
                        __le64 timestamp;
@@ -1194,7 +1194,7 @@ struct ieee80211_mgmt {
                        __le16 capab_info;
                        /* followed by some of SSID, Supported rates,
                         * FH Params, DS Params, CF Params, IBSS Params */
-                       u8 variable[0];
+                       u8 variable[];
                } __packed probe_resp;
                struct {
                        u8 category;
@@ -1203,16 +1203,16 @@ struct ieee80211_mgmt {
                                        u8 action_code;
                                        u8 dialog_token;
                                        u8 status_code;
-                                       u8 variable[0];
+                                       u8 variable[];
                                } __packed wme_action;
                                struct{
                                        u8 action_code;
-                                       u8 variable[0];
+                                       u8 variable[];
                                } __packed chan_switch;
                                struct{
                                        u8 action_code;
                                        struct ieee80211_ext_chansw_ie data;
-                                       u8 variable[0];
+                                       u8 variable[];
                                } __packed ext_chan_switch;
                                struct{
                                        u8 action_code;
@@ -1228,7 +1228,7 @@ struct ieee80211_mgmt {
                                        __le16 timeout;
                                        __le16 start_seq_num;
                                        /* followed by BA Extension */
-                                       u8 variable[0];
+                                       u8 variable[];
                                } __packed addba_req;
                                struct{
                                        u8 action_code;
@@ -1244,11 +1244,11 @@ struct ieee80211_mgmt {
                                } __packed delba;
                                struct {
                                        u8 action_code;
-                                       u8 variable[0];
+                                       u8 variable[];
                                } __packed self_prot;
                                struct{
                                        u8 action_code;
-                                       u8 variable[0];
+                                       u8 variable[];
                                } __packed mesh_action;
                                struct {
                                        u8 action;
@@ -1292,7 +1292,7 @@ struct ieee80211_mgmt {
                                        u8 toa[6];
                                        __le16 tod_error;
                                        __le16 toa_error;
-                                       u8 variable[0];
+                                       u8 variable[];
                                } __packed ftm;
                                struct {
                                        u8 action_code;

diff --git a/include/uapi/linux/dlm_device.h b/include/uapi/linux/dlm_device.h
index f880d28311605cb941bbc53d94ff4921f88e35df..e83954c69fff7fd256a0838a9ba493a6c37d44c3 100644 (file)
--- a/include/uapi/linux/dlm_device.h
+++ b/include/uapi/linux/dlm_device.h
@@ -45,13 +45,13 @@ struct dlm_lock_params {
        void __user *bastaddr;
        struct dlm_lksb __user *lksb;
        char lvb[DLM_USER_LVB_LEN];
-       char name[0];
+       char name[];
 };
 
 struct dlm_lspace_params {
        __u32 flags;
        __u32 minor;
-       char name[0];
+       char name[];
 };
 
 struct dlm_purge_params {