treewide: Replace open-coded flex arrays in unions

In support of enabling -Warray-bounds and -Wzero-length-bounds and correctly handling run-time memcpy() bounds checking, replace all open-coded flexible arrays (i.e. 0-element arrays) in unions with the DECLARE_FLEX_ARRAY() helper macro. This fixes warnings such as: fs/hpfs/anode.c: In function 'hpfs_add_sector_to_btree': fs/hpfs/anode.c:209:27: warning: array subscript 0 is outside the bounds of an interior zero-length array 'struct bplus_internal_node[0]' [-Wzero-length-bounds] 209 | anode->btree.u.internal[0].down = cpu_to_le32(a); | ~~~~~~~~~~~~~~~~~~~~~~~^~~ In file included from fs/hpfs/hpfs_fn.h:26, from fs/hpfs/anode.c:10: fs/hpfs/hpfs.h:412:32: note: while referencing 'internal' 412 | struct bplus_internal_node internal[0]; /* (internal) 2-word entries giving | ^~~~~~~~ drivers/net/can/usb/etas_es58x/es58x_fd.c: In function 'es58x_fd_tx_can_msg': drivers/net/can/usb/etas_es58x/es58x_fd.c:360:35: warning: array subscript 65535 is outside the bounds of an interior zero-length array 'u8[0]' {aka 'unsigned char[]'} [-Wzero-length-bounds] 360 | tx_can_msg = (typeof(tx_can_msg))&es58x_fd_urb_cmd->raw_msg[msg_len]; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from drivers/net/can/usb/etas_es58x/es58x_core.h:22, from drivers/net/can/usb/etas_es58x/es58x_fd.c:17: drivers/net/can/usb/etas_es58x/es58x_fd.h:231:6: note: while referencing 'raw_msg' 231 | u8 raw_msg[0]; | ^~~~~~~

Kees Cook committed 5 years ago

Commit fa7845c1 parent 3080ea513 files · +56 −33Browse files

Showing the changes to include/uapi (2 of 13 files). Show all

Unified · Split

2 files

include/uapi/rdma/rdma_user_rxe.h +2 −2
include/uapi/sound/asoc.h +2 −2

include/uapi/rdma/rdma_user_rxe.h+2−2

@@ -141,8 +141,8 @@ struct rxe_dma_info { · 140 unmodified lines
141	__u32 sge_offset;	141	__u32 sge_offset;
142	__u32 reserved;	142	__u32 reserved;
143	union {	143	union {
144	__u8 inline_data[0];	144	__DECLARE_FLEX_ARRAY(__u8, inline_data);
145	struct rxe_sge sge[0];	145	__DECLARE_FLEX_ARRAY(struct rxe_sge, sge);
146	};	146	};
147	};	147	};
148		148

include/uapi/sound/asoc.h+2−2

@@ -240,8 +240,8 @@ struct snd_soc_tplg_vendor_array { · 239 unmodified lines
240	struct snd_soc_tplg_private {	240	struct snd_soc_tplg_private {
241	__le32 size; /* in bytes of private data */	241	__le32 size; /* in bytes of private data */
242	union {	242	union {
243	char data[0];	243	__DECLARE_FLEX_ARRAY(char, data);
244	struct snd_soc_tplg_vendor_array array[0];	244	__DECLARE_FLEX_ARRAY(struct snd_soc_tplg_vendor_array, array);
245	};	245	};
246	} __attribute__((packed));	246	} __attribute__((packed));
247		247