misc: Replace zero-length arrays with flexible array member
Subsystems (2)
cover misc: Replace zero-length arrays with flexible array member
This is a tree-wide cleanup inspired by a Linux kernel commit (from Gustavo A. R. Silva).
--v-- description start --v--
The current codebase makes use of the zero-length array language extension to the C90 standard, but the preferred mechanism to declare variable-length types such as these ones is a flexible array member [1], introduced in C99:
struct foo {
int stuff;
struct boo array[];
};By making use of the mechanism above, we will get a compiler warning in case the flexible array does not occur last in the structure, which will help us prevent some kind of undefined behavior bugs from being unadvertenly introduced [2] to the Linux codebase from now on.
--^-- description end --^--
Do the similar housekeeping in the QEMU codebase (which uses C99 since commit 7be41675f7cb).
The first patch is done with the help of a coccinelle semantic patch. However Coccinelle does not recognize:
struct foo {
int stuff;
struct boo array[];
} QEMU_PACKED;but does recognize:
struct QEMU_PACKED foo {
int stuff;
struct boo array[];
};I'm not sure why, neither it is worth refactoring all QEMU structures to use the attributes before the structure name, so I did the 2nd patch manually.
Anyway this is annoying, because many structures are not handled by coccinelle. Maybe this needs to be reported to upstream coccinelle?
I used spatch 1.0.8 with:
-I include --include-headers \ --macro-file scripts/cocci-macro-file.h \ --keep-comments --indent 4
Regards,
Phil.
Philippe Mathieu-Daudé (2):
misc: Replace zero-length arrays with flexible array member
(automatic)
misc: Replace zero-length arrays with flexible array member (manual)
docs/interop/vhost-user.rst | 4 ++-- block/qed.h | 2 +- bsd-user/qemu.h | 2 +- contrib/libvhost-user/libvhost-user.h | 2 +- hw/m68k/bootinfo.h | 2 +- hw/scsi/srp.h | 6 +++--- hw/xen/xen_pt.h | 2 +- include/hw/acpi/acpi-defs.h | 16 ++++++++-------- include/hw/arm/smmu-common.h | 2 +- include/hw/boards.h | 2 +- include/hw/i386/intel_iommu.h | 3 ++- include/hw/s390x/event-facility.h | 2 +- include/hw/s390x/sclp.h | 8 ++++---- include/hw/virtio/virtio-iommu.h | 2 +- include/sysemu/cryptodev.h | 2 +- include/tcg/tcg.h | 2 +- pc-bios/s390-ccw/bootmap.h | 2 +- pc-bios/s390-ccw/sclp.h | 2 +- tests/qtest/libqos/ahci.h | 2 +- block/linux-aio.c | 2 +- block/vmdk.c | 2 +- hw/acpi/nvdimm.c | 6 +++--- hw/char/sclpconsole-lm.c | 2 +- hw/char/sclpconsole.c | 2 +- hw/dma/soc_dma.c | 2 +- hw/i386/x86.c | 2 +- hw/misc/omap_l4.c | 2 +- hw/nvram/eeprom93xx.c | 2 +- hw/rdma/vmw/pvrdma_qp_ops.c | 4 ++-- hw/s390x/virtio-ccw.c | 2 +- hw/usb/dev-network.c | 2 +- hw/usb/dev-smartcard-reader.c | 4 ++-- hw/virtio/virtio.c | 4 ++-- net/queue.c | 2 +- target/s390x/ioinst.c | 2 +- 35 files changed, 54 insertions(+), 53 deletions(-)
Signature · 1 line
2.21.1
PATCH 1/2 misc: Replace zero-length arrays with flexible array member (automatic)
Description copied from Linux kernel commit from Gustavo A. R. Silva (see [3]):
--v-- description start --v--
The current codebase makes use of the zero-length array language extension to the C90 standard, but the preferred mechanism to declare variable-length types such as these ones is a flexible array member [1], introduced in C99:
struct foo {
int stuff;
struct boo array[];
};By making use of the mechanism above, we will get a compiler warning in case the flexible array does not occur last in the structure, which will help us prevent some kind of undefined behavior bugs from being unadvertenly introduced [2] to the Linux codebase from now on.
--^-- description end --^--
Do the similar housekeeping in the QEMU codebase (which uses C99 since commit 7be41675f7cb).
All these instances of code were found with the help of the following Coccinelle script:
@@
identifier s, a;
type T;
@@
struct s {
...
- T a[0];
+ T a[];
};
@@
identifier s, a;
type T;
@@
struct s {
... - T a[0];
+ T a[];
} QEMU_PACKED;
[1] https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html
[2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=76497732932f
[3] https://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git/commit/?id=17642a2fbd2c1
--- bsd-user/qemu.h | 2 +- contrib/libvhost-user/libvhost-user.h | 2 +- hw/m68k/bootinfo.h | 2 +- hw/scsi/srp.h | 6 +++--- hw/xen/xen_pt.h | 2 +- include/hw/acpi/acpi-defs.h | 12 ++++++------ include/hw/arm/smmu-common.h | 2 +- include/hw/i386/intel_iommu.h | 3 ++- include/hw/virtio/virtio-iommu.h | 2 +- include/sysemu/cryptodev.h | 2 +- include/tcg/tcg.h | 2 +- pc-bios/s390-ccw/bootmap.h | 2 +- pc-bios/s390-ccw/sclp.h | 2 +- tests/qtest/libqos/ahci.h | 2 +- block/linux-aio.c | 2 +- hw/acpi/nvdimm.c | 6 +++--- hw/dma/soc_dma.c | 2 +- hw/i386/x86.c | 2 +- hw/misc/omap_l4.c | 2 +- hw/nvram/eeprom93xx.c | 2 +- hw/rdma/vmw/pvrdma_qp_ops.c | 4 ++-- hw/usb/dev-network.c | 2 +- hw/usb/dev-smartcard-reader.c | 4 ++-- hw/virtio/virtio.c | 4 ++-- net/queue.c | 2 +- 25 files changed, 38 insertions(+), 37 deletions(-)
bsd-user/qemu.h +1 -1
@@ -95,7 +95,7 @@ typedef struct TaskState {struct sigqueue *first_free;/* first free siginfo queue entry */ int signal_pending;/* non zero if a signal may be pending */ -uint8_t stack[0 ]; +uint8_t stack[]; } __attribute__((aligned(16))) TaskState;void init_task_state (TaskState *ts);
contrib/libvhost-user/libvhost-user.h +1 -1
@@ -286,7 +286,7 @@ typedef struct VuVirtqInflight {uint16_t used_idx;/* Used to track the state of each descriptor in descriptor table */ -VuDescStateSplit desc[0 ]; +VuDescStateSplit desc[]; } VuVirtqInflight; typedef struct VuVirtqInflightDesc {
hw/m68k/bootinfo.h +1 -1
@@ -14,7 +14,7 @@struct bi_record {uint16_t tag;/* tag ID */ uint16_t size;/* size of record */ -uint32_t data[0 ];/* data */ +uint32_t data[];/* data */ };/* machine independent tags */
hw/scsi/srp.h +3 -3
@@ -112,7 +112,7 @@ struct srp_direct_buf {struct srp_indirect_buf {struct srp_direct_buf table_desc;uint32_t len; -struct srp_direct_buf desc_list[0 ]; +struct srp_direct_buf desc_list[]; }QEMU_PACKED ;enum {
@@ -211,7 +211,7 @@ struct srp_cmd {uint8_t reserved4;uint8_t add_cdb_len;uint8_t cdb[16 ]; -uint8_t add_data[0 ]; +uint8_t add_data[]; }QEMU_PACKED ;enum {
@@ -241,7 +241,7 @@ struct srp_rsp {uint32_t data_in_res_cnt;uint32_t sense_data_len;uint32_t resp_data_len; - uint8_t data[0]; + uint8_t data[]; }QEMU_PACKED ;#endif /* SCSI_SRP_H */
hw/xen/xen_pt.h +1 -1
@@ -203,7 +203,7 @@ typedef struct XenPTMSIX {uint64_t mmio_base_addr;MemoryRegion mmio;void *phys_iomem_base; -XenPTMSIXEntry msix_entry[0 ]; +XenPTMSIXEntry msix_entry[]; } XenPTMSIX;struct XenPCIPassthroughState {
include/hw/acpi/acpi-defs.h +6 -6
@@ -518,7 +518,7 @@ struct AcpiDmarDeviceScope {struct {uint8_t device;uint8_t function; - } path[0 ]; + } path[]; }QEMU_PACKED ;typedef struct AcpiDmarDeviceScope AcpiDmarDeviceScope ;
@@ -530,7 +530,7 @@ struct AcpiDmarHardwareUnit {uint8_t reserved;uint16_t pci_segment;/* The PCI Segment associated with this unit */ uint64_t address;/* Base address of remapping hardware register-set */ -AcpiDmarDeviceScope scope[0 ]; +AcpiDmarDeviceScope scope[]; }QEMU_PACKED ;typedef struct AcpiDmarHardwareUnit AcpiDmarHardwareUnit ;
@@ -541,7 +541,7 @@ struct AcpiDmarRootPortATS {uint8_t flags;uint8_t reserved;uint16_t pci_segment; -AcpiDmarDeviceScope scope[0 ]; +AcpiDmarDeviceScope scope[]; }QEMU_PACKED ;typedef struct AcpiDmarRootPortATS AcpiDmarRootPortATS ;
@@ -604,7 +604,7 @@ typedef struct AcpiIortMemoryAccess AcpiIortMemoryAccess;struct AcpiIortItsGroup {ACPI_IORT_NODE_HEADER_DEF uint32_t its_count; -uint32_t identifiers[0 ]; +uint32_t identifiers[]; }QEMU_PACKED ;typedef struct AcpiIortItsGroup AcpiIortItsGroup ;
@@ -621,7 +621,7 @@ struct AcpiIortSmmu3 {uint32_t pri_gsiv;uint32_t gerr_gsiv;uint32_t sync_gsiv; -AcpiIortIdMapping id_mapping_array[0 ]; +AcpiIortIdMapping id_mapping_array[]; }QEMU_PACKED ;typedef struct AcpiIortSmmu3 AcpiIortSmmu3 ;
@@ -630,7 +630,7 @@ struct AcpiIortRC {AcpiIortMemoryAccess memory_properties;uint32_t ats_attribute;uint32_t pci_segment_number; -AcpiIortIdMapping id_mapping_array[0 ]; +AcpiIortIdMapping id_mapping_array[]; }QEMU_PACKED ;typedef struct AcpiIortRC AcpiIortRC ;
include/hw/arm/smmu-common.h +1 -1
@@ -85,7 +85,7 @@ typedef struct SMMUDevice {typedef struct SMMUPciBus {PCIBus *bus; -SMMUDevice *pbdev[0 ];/* Parent array is sparse, so dynamically alloc */ +SMMUDevice *pbdev[];/* Parent array is sparse, so dynamically alloc */ }SMMUPciBus ; typedef struct SMMUIOTLBKey {
include/hw/i386/intel_iommu.h +2 -1
@@ -118,7 +118,8 @@ struct VTDAddressSpace {struct VTDBus {PCIBus * bus;/* A reference to the bus to provide translation for */ -VTDAddressSpace *dev_as[0 ];/* A table of VTDAddressSpace objects indexed by devfn */ +/* A table of VTDAddressSpace objects indexed by devfn */ +VTDAddressSpace *dev_as[]; };struct VTDIOTLBEntry {
include/hw/virtio/virtio-iommu.h +1 -1
@@ -41,7 +41,7 @@ typedef struct IOMMUDevice {typedef struct IOMMUPciBus {PCIBus *bus; -IOMMUDevice *pbdev[0 ];/* Parent array is sparse, so dynamically alloc */ +IOMMUDevice *pbdev[];/* Parent array is sparse, so dynamically alloc */ }IOMMUPciBus ; typedef struct VirtIOIOMMU {
include/sysemu/cryptodev.h +1 -1
@@ -143,7 +143,7 @@ typedef struct CryptoDevBackendSymOpInfo {uint8_t *dst;uint8_t *aad_data;uint8_t *digest_result; -uint8_t data[0 ]; +uint8_t data[]; } CryptoDevBackendSymOpInfo; typedef struct CryptoDevBackendClass {
include/tcg/tcg.h +1 -1
@@ -267,7 +267,7 @@ struct TCGLabel {typedef struct TCGPool {struct TCGPool *next;int size; -uint8_t data[0 ] __attribute__ ((aligned)); +uint8_t data[] __attribute__ ((aligned)); }TCGPool ;#define TCG_POOL_CHUNK_SIZE 32768
pc-bios/s390-ccw/bootmap.h +1 -1
@@ -136,7 +136,7 @@ typedef struct BootMapScriptHeader {typedef struct BootMapScript {BootMapScriptHeader header; -BootMapScriptEntry entry[0 ]; +BootMapScriptEntry entry[]; } __attribute__ ((packed))BootMapScript ;/*
pc-bios/s390-ccw/sclp.h +1 -1
@@ -95,7 +95,7 @@ typedef struct EventBufferHeader {typedef struct WriteEventData {SCCBHeader h;EventBufferHeader ebh; -char data[0 ]; +char data[]; } __attribute__((packed))WriteEventData ; typedef struct ReadEventData {
tests/qtest/libqos/ahci.h +1 -1
@@ -351,7 +351,7 @@ typedef struct AHCIQState {typedef struct FIS {uint8_t fis_type;uint8_t flags; -char data[0 ]; +char data[]; } __attribute__((__packed__ ))FIS ;/**
block/linux-aio.c +1 -1
@@ -121,7 +121,7 @@ struct aio_ring {unsigned incompat_features;unsigned header_length;/* size of aio_ring */ -struct io_event io_events[0 ]; +struct io_event io_events[]; };/**
hw/acpi/nvdimm.c +3 -3
@@ -485,7 +485,7 @@ struct NvdimmFuncGetLabelDataOut {/* the size of buffer filled by QEMU. */ uint32_t len;uint32_t func_ret_status;/* return status code. */ -uint8_t out_buf[0 ];/* the data got via Get Namesapce Label function. */ +uint8_t out_buf[];/* the data got via Get Namesapce Label function. */ }QEMU_PACKED ;typedef struct NvdimmFuncGetLabelDataOut NvdimmFuncGetLabelDataOut ;QEMU_BUILD_BUG_ON (sizeof (NvdimmFuncGetLabelDataOut) >NVDIMM_DSM_MEMORY_SIZE );
@@ -493,7 +493,7 @@ QEMU_BUILD_BUG_ON(sizeof(NvdimmFuncGetLabelDataOut) > NVDIMM_DSM_MEMORY_SIZE);struct NvdimmFuncSetLabelDataIn {uint32_t offset;/* the offset in the namespace label data area. */ uint32_t length;/* the size of data is to be written via the function. */ -uint8_t in_buf[0 ];/* the data written to label data area. */ +uint8_t in_buf[];/* the data written to label data area. */ }QEMU_PACKED ;typedef struct NvdimmFuncSetLabelDataIn NvdimmFuncSetLabelDataIn ; QEMU_BUILD_BUG_ON(sizeof(NvdimmFuncSetLabelDataIn) +
@@ -510,7 +510,7 @@ struct NvdimmFuncReadFITOut {/* the size of buffer filled by QEMU. */ uint32_t len;uint32_t func_ret_status;/* return status code. */ -uint8_t fit[0 ];/* the FIT data. */ +uint8_t fit[];/* the FIT data. */ }QEMU_PACKED ;typedef struct NvdimmFuncReadFITOut NvdimmFuncReadFITOut ;QEMU_BUILD_BUG_ON (sizeof (NvdimmFuncReadFITOut) >NVDIMM_DSM_MEMORY_SIZE );
hw/dma/soc_dma.c +1 -1
@@ -80,7 +80,7 @@ struct dma_s { } *memmap;int memmap_size; -struct soc_dma_ch_s ch[0 ]; +struct soc_dma_ch_s ch[]; };static void soc_dma_ch_schedule (struct soc_dma_ch_s *ch,int delay_bytes)
hw/i386/x86.c +1 -1
@@ -328,7 +328,7 @@ struct setup_data {uint64_t next;uint32_t type;uint32_t len; -uint8_t data[0 ]; +uint8_t data[]; } __attribute__((packed));
hw/misc/omap_l4.c +1 -1
@@ -24,7 +24,7 @@ struct omap_l4_s {MemoryRegion *address_space;hwaddr base;int ta_num; -struct omap_target_agent_s ta[0 ]; +struct omap_target_agent_s ta[]; }; struct omap_l4_s *omap_l4_init(MemoryRegion *address_space,
hw/nvram/eeprom93xx.c +1 -1
@@ -86,7 +86,7 @@ struct _eeprom_t {uint8_t addrbits;uint16_t size;uint16_t data; -uint16_t contents[0 ]; +uint16_t contents[]; };/* Code for saving and restoring of EEPROM state. */
hw/rdma/vmw/pvrdma_qp_ops.c +2 -2
@@ -34,13 +34,13 @@ typedef struct CompHandlerCtx {/* Send Queue WQE */ typedef struct PvrdmaSqWqe {struct pvrdma_sq_wqe_hdr hdr; -struct pvrdma_sge sge[0 ]; +struct pvrdma_sge sge[]; }PvrdmaSqWqe ;/* Recv Queue WQE */ typedef struct PvrdmaRqWqe {struct pvrdma_rq_wqe_hdr hdr; -struct pvrdma_sge sge[0 ]; +struct pvrdma_sge sge[]; }PvrdmaRqWqe ;/*
hw/usb/dev-network.c +1 -1
@@ -626,7 +626,7 @@ static const uint32_t oid_supported_list[] =struct rndis_response {QTAILQ_ENTRY (rndis_response) entries;uint32_t length; -uint8_t buf[0 ]; +uint8_t buf[]; }; typedef struct USBNetState {
hw/usb/dev-smartcard-reader.c +2 -2
@@ -227,7 +227,7 @@ typedef struct QEMU_PACKED CCID_Parameter { typedef struct QEMU_PACKED CCID_DataBlock {CCID_BULK_IN b;uint8_t bChainParameter; -uint8_t abData[0 ]; +uint8_t abData[]; } CCID_DataBlock;/* 6.1.4 PC_to_RDR_XfrBlock */
@@ -235,7 +235,7 @@ typedef struct QEMU_PACKED CCID_XferBlock {CCID_Header hdr;uint8_t bBWI;/* Block Waiting Timeout */ uint16_t wLevelParameter;/* XXX currently unused */ -uint8_t abData[0 ]; +uint8_t abData[]; } CCID_XferBlock; typedef struct QEMU_PACKED CCID_IccPowerOn {
hw/virtio/virtio.c +2 -2
@@ -54,7 +54,7 @@ typedef struct VRingAvail {uint16_t flags;uint16_t idx; -uint16_t ring[0 ]; +uint16_t ring[]; } VRingAvail; typedef struct VRingUsedElem
@@ -67,7 +67,7 @@ typedef struct VRingUsed {uint16_t flags;uint16_t idx; -VRingUsedElem ring[0 ]; +VRingUsedElem ring[]; } VRingUsed; typedef struct VRingMemoryRegionCaches {
net/queue.c +1 -1
@@ -46,7 +46,7 @@ struct NetPacket {unsigned flags;int size;NetPacketSent *sent_cb; -uint8_t data[0 ]; +uint8_t data[]; };struct NetQueue {
Signature · 1 line
2.21.1
Re: [PATCH 1/2] misc: Replace zero-length arrays with flexible array member (automatic)
Quoted 507 lines · Philippe Mathieu-Daudé
Description copied from Linux kernel commit from Gustavo A. R. Silva (see [3]):
--v-- description start --v--
The current codebase makes use of the zero-length array language extension to the C90 standard, but the preferred mechanism to declare variable-length types such as these ones is a flexible array member [1], introduced in C99:
struct foo { int stuff; struct boo array[]; };By making use of the mechanism above, we will get a compiler warning in case the flexible array does not occur last in the structure, which will help us prevent some kind of undefined behavior bugs from being unadvertenly introduced [2] to the Linux codebase from now on.
--^-- description end --^--
Do the similar housekeeping in the QEMU codebase (which uses C99 since commit
7be41675f7cb).All these instances of code were found with the help of the following Coccinelle script:
@@
identifier s, a;
type T;
@@struct s { ... - T a[0]; + T a[]; }; @@ identifier s, a; type T; @@ struct s { ... - T a[0]; + T a[]; } QEMU_PACKED;[1] https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html
[2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=76497732932f
[3] https://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git/commit/?id=17642a2fbd2c1Inspired-by Gustavo A. R. Silva <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- bsd-user/qemu.h | 2 +- contrib/libvhost-user/libvhost-user.h | 2 +- hw/m68k/bootinfo.h | 2 +- hw/scsi/srp.h | 6 +++--- hw/xen/xen_pt.h | 2 +- include/hw/acpi/acpi-defs.h | 12 ++++++------ include/hw/arm/smmu-common.h | 2 +- include/hw/i386/intel_iommu.h | 3 ++- include/hw/virtio/virtio-iommu.h | 2 +- include/sysemu/cryptodev.h | 2 +- include/tcg/tcg.h | 2 +- pc-bios/s390-ccw/bootmap.h | 2 +- pc-bios/s390-ccw/sclp.h | 2 +- tests/qtest/libqos/ahci.h | 2 +- block/linux-aio.c | 2 +- hw/acpi/nvdimm.c | 6 +++--- hw/dma/soc_dma.c | 2 +- hw/i386/x86.c | 2 +- hw/misc/omap_l4.c | 2 +- hw/nvram/eeprom93xx.c | 2 +- hw/rdma/vmw/pvrdma_qp_ops.c | 4 ++-- hw/usb/dev-network.c | 2 +- hw/usb/dev-smartcard-reader.c | 4 ++-- hw/virtio/virtio.c | 4 ++-- net/queue.c | 2 +- 25 files changed, 38 insertions(+), 37 deletions(-)bsd-user/qemu.h +1
-1@@ -95,7 +95,7 @@ typedef struct TaskState {struct sigqueue *first_free;/* first free siginfo queue entry */ int signal_pending;/* non zero if a signal may be pending */ -uint8_t stack[0 ]; +uint8_t stack[]; } __attribute__((aligned(16))) TaskState;void init_task_state (TaskState *ts);contrib/libvhost-user/libvhost-user.h +1
-1@@ -286,7 +286,7 @@ typedef struct VuVirtqInflight {uint16_t used_idx;/* Used to track the state of each descriptor in descriptor table */ -VuDescStateSplit desc[0 ]; +VuDescStateSplit desc[]; } VuVirtqInflight; typedef struct VuVirtqInflightDesc {hw/m68k/bootinfo.h +1
-1@@ -14,7 +14,7 @@struct bi_record {uint16_t tag;/* tag ID */ uint16_t size;/* size of record */ -uint32_t data[0 ];/* data */ +uint32_t data[];/* data */ };/* machine independent tags */ hw/scsi/srp.h +3
-3@@ -112,7 +112,7 @@ struct srp_direct_buf {struct srp_indirect_buf {struct srp_direct_buf table_desc;uint32_t len; -struct srp_direct_buf desc_list[0 ]; +struct srp_direct_buf desc_list[]; }QEMU_PACKED ;enum {@@ -211,7 +211,7 @@ struct srp_cmd {uint8_t reserved4;uint8_t add_cdb_len;uint8_t cdb[16 ]; -uint8_t add_data[0 ]; +uint8_t add_data[]; }QEMU_PACKED ;enum {@@ -241,7 +241,7 @@ struct srp_rsp {uint32_t data_in_res_cnt;uint32_t sense_data_len;uint32_t resp_data_len; - uint8_t data[0]; + uint8_t data[]; }QEMU_PACKED ;#endif /* SCSI_SRP_H */ hw/xen/xen_pt.h +1
-1@@ -203,7 +203,7 @@ typedef struct XenPTMSIX {uint64_t mmio_base_addr;MemoryRegion mmio;void *phys_iomem_base; -XenPTMSIXEntry msix_entry[0 ]; +XenPTMSIXEntry msix_entry[]; } XenPTMSIX;struct XenPCIPassthroughState {include/hw/acpi/acpi-defs.h +6
-6@@ -518,7 +518,7 @@ struct AcpiDmarDeviceScope {struct {uint8_t device;uint8_t function; - } path[0 ]; + } path[]; }QEMU_PACKED ;typedef struct AcpiDmarDeviceScope AcpiDmarDeviceScope ;@@ -530,7 +530,7 @@ struct AcpiDmarHardwareUnit {uint8_t reserved;uint16_t pci_segment;/* The PCI Segment associated with this unit */ uint64_t address;/* Base address of remapping hardware register-set */ -AcpiDmarDeviceScope scope[0 ]; +AcpiDmarDeviceScope scope[]; }QEMU_PACKED ;typedef struct AcpiDmarHardwareUnit AcpiDmarHardwareUnit ;@@ -541,7 +541,7 @@ struct AcpiDmarRootPortATS {uint8_t flags;uint8_t reserved;uint16_t pci_segment; -AcpiDmarDeviceScope scope[0 ]; +AcpiDmarDeviceScope scope[]; }QEMU_PACKED ;typedef struct AcpiDmarRootPortATS AcpiDmarRootPortATS ;@@ -604,7 +604,7 @@ typedef struct AcpiIortMemoryAccess AcpiIortMemoryAccess;struct AcpiIortItsGroup {ACPI_IORT_NODE_HEADER_DEF uint32_t its_count; -uint32_t identifiers[0 ]; +uint32_t identifiers[]; }QEMU_PACKED ;typedef struct AcpiIortItsGroup AcpiIortItsGroup ;@@ -621,7 +621,7 @@ struct AcpiIortSmmu3 {uint32_t pri_gsiv;uint32_t gerr_gsiv;uint32_t sync_gsiv; -AcpiIortIdMapping id_mapping_array[0 ]; +AcpiIortIdMapping id_mapping_array[]; }QEMU_PACKED ;typedef struct AcpiIortSmmu3 AcpiIortSmmu3 ;@@ -630,7 +630,7 @@ struct AcpiIortRC {AcpiIortMemoryAccess memory_properties;uint32_t ats_attribute;uint32_t pci_segment_number; -AcpiIortIdMapping id_mapping_array[0 ]; +AcpiIortIdMapping id_mapping_array[]; }QEMU_PACKED ;typedef struct AcpiIortRC AcpiIortRC ;include/hw/arm/smmu-common.h +1
-1@@ -85,7 +85,7 @@ typedef struct SMMUDevice {typedef struct SMMUPciBus {PCIBus *bus; -SMMUDevice *pbdev[0 ];/* Parent array is sparse, so dynamically alloc */ +SMMUDevice *pbdev[];/* Parent array is sparse, so dynamically alloc */ }SMMUPciBus ; typedef struct SMMUIOTLBKey {include/hw/i386/intel_iommu.h +2
-1@@ -118,7 +118,8 @@ struct VTDAddressSpace {struct VTDBus {PCIBus * bus;/* A reference to the bus to provide translation for */ -VTDAddressSpace *dev_as[0 ];/* A table of VTDAddressSpace objects indexed by devfn */ +/* A table of VTDAddressSpace objects indexed by devfn */ +VTDAddressSpace *dev_as[]; };struct VTDIOTLBEntry {include/hw/virtio/virtio-iommu.h +1
-1@@ -41,7 +41,7 @@ typedef struct IOMMUDevice {typedef struct IOMMUPciBus {PCIBus *bus; -IOMMUDevice *pbdev[0 ];/* Parent array is sparse, so dynamically alloc */ +IOMMUDevice *pbdev[];/* Parent array is sparse, so dynamically alloc */ }IOMMUPciBus ; typedef struct VirtIOIOMMU {include/sysemu/cryptodev.h +1
-1@@ -143,7 +143,7 @@ typedef struct CryptoDevBackendSymOpInfo {uint8_t *dst;uint8_t *aad_data;uint8_t *digest_result; -uint8_t data[0 ]; +uint8_t data[]; } CryptoDevBackendSymOpInfo; typedef struct CryptoDevBackendClass {include/tcg/tcg.h +1
-1@@ -267,7 +267,7 @@ struct TCGLabel {typedef struct TCGPool {struct TCGPool *next;int size; -uint8_t data[0 ] __attribute__ ((aligned)); +uint8_t data[] __attribute__ ((aligned)); }TCGPool ;#define TCG_POOL_CHUNK_SIZE 32768pc-bios/s390-ccw/bootmap.h +1
-1@@ -136,7 +136,7 @@ typedef struct BootMapScriptHeader {typedef struct BootMapScript {BootMapScriptHeader header; -BootMapScriptEntry entry[0 ]; +BootMapScriptEntry entry[]; } __attribute__ ((packed))BootMapScript ;/* pc-bios/s390-ccw/sclp.h +1
-1@@ -95,7 +95,7 @@ typedef struct EventBufferHeader {typedef struct WriteEventData {SCCBHeader h;EventBufferHeader ebh; -char data[0 ]; +char data[]; } __attribute__((packed))WriteEventData ; typedef struct ReadEventData {tests/qtest/libqos/ahci.h +1
-1@@ -351,7 +351,7 @@ typedef struct AHCIQState {typedef struct FIS {uint8_t fis_type;uint8_t flags; -char data[0 ]; +char data[]; } __attribute__((__packed__ ))FIS ;/** block/linux-aio.c +1
-1@@ -121,7 +121,7 @@ struct aio_ring {unsigned incompat_features;unsigned header_length;/* size of aio_ring */ -struct io_event io_events[0 ]; +struct io_event io_events[]; };/** hw/acpi/nvdimm.c +3
-3@@ -485,7 +485,7 @@ struct NvdimmFuncGetLabelDataOut {/* the size of buffer filled by QEMU. */ uint32_t len;uint32_t func_ret_status;/* return status code. */ -uint8_t out_buf[0 ];/* the data got via Get Namesapce Label function. */ +uint8_t out_buf[];/* the data got via Get Namesapce Label function. */ }QEMU_PACKED ;typedef struct NvdimmFuncGetLabelDataOut NvdimmFuncGetLabelDataOut ;QEMU_BUILD_BUG_ON (sizeof (NvdimmFuncGetLabelDataOut) >NVDIMM_DSM_MEMORY_SIZE );@@ -493,7 +493,7 @@ QEMU_BUILD_BUG_ON(sizeof(NvdimmFuncGetLabelDataOut) > NVDIMM_DSM_MEMORY_SIZE);struct NvdimmFuncSetLabelDataIn {uint32_t offset;/* the offset in the namespace label data area. */ uint32_t length;/* the size of data is to be written via the function. */ -uint8_t in_buf[0 ];/* the data written to label data area. */ +uint8_t in_buf[];/* the data written to label data area. */ }QEMU_PACKED ;typedef struct NvdimmFuncSetLabelDataIn NvdimmFuncSetLabelDataIn ; QEMU_BUILD_BUG_ON(sizeof(NvdimmFuncSetLabelDataIn) +@@ -510,7 +510,7 @@ struct NvdimmFuncReadFITOut {/* the size of buffer filled by QEMU. */ uint32_t len;uint32_t func_ret_status;/* return status code. */ -uint8_t fit[0 ];/* the FIT data. */ +uint8_t fit[];/* the FIT data. */ }QEMU_PACKED ;typedef struct NvdimmFuncReadFITOut NvdimmFuncReadFITOut ;QEMU_BUILD_BUG_ON (sizeof (NvdimmFuncReadFITOut) >NVDIMM_DSM_MEMORY_SIZE );hw/dma/soc_dma.c +1
-1@@ -80,7 +80,7 @@ struct dma_s { } *memmap;int memmap_size; -struct soc_dma_ch_s ch[0 ]; +struct soc_dma_ch_s ch[]; };static void soc_dma_ch_schedule (struct soc_dma_ch_s *ch,int delay_bytes)hw/i386/x86.c +1
-1@@ -328,7 +328,7 @@ struct setup_data {uint64_t next;uint32_t type;uint32_t len; -uint8_t data[0 ]; +uint8_t data[]; } __attribute__((packed));hw/misc/omap_l4.c +1
-1@@ -24,7 +24,7 @@ struct omap_l4_s {MemoryRegion *address_space;hwaddr base;int ta_num; -struct omap_target_agent_s ta[0 ]; +struct omap_target_agent_s ta[]; }; struct omap_l4_s *omap_l4_init(MemoryRegion *address_space,hw/nvram/eeprom93xx.c +1
-1@@ -86,7 +86,7 @@ struct _eeprom_t {uint8_t addrbits;uint16_t size;uint16_t data; -uint16_t contents[0 ]; +uint16_t contents[]; };/* Code for saving and restoring of EEPROM state. */ hw/rdma/vmw/pvrdma_qp_ops.c +2
-2@@ -34,13 +34,13 @@ typedef struct CompHandlerCtx {/* Send Queue WQE */ typedef struct PvrdmaSqWqe {struct pvrdma_sq_wqe_hdr hdr; -struct pvrdma_sge sge[0 ]; +struct pvrdma_sge sge[]; }PvrdmaSqWqe ;/* Recv Queue WQE */ typedef struct PvrdmaRqWqe {struct pvrdma_rq_wqe_hdr hdr; -struct pvrdma_sge sge[0 ]; +struct pvrdma_sge sge[]; }PvrdmaRqWqe ;/* hw/usb/dev-network.c +1
-1@@ -626,7 +626,7 @@ static const uint32_t oid_supported_list[] =struct rndis_response {QTAILQ_ENTRY (rndis_response) entries;uint32_t length; -uint8_t buf[0 ]; +uint8_t buf[]; }; typedef struct USBNetState {hw/usb/dev-smartcard-reader.c +2
-2@@ -227,7 +227,7 @@ typedef struct QEMU_PACKED CCID_Parameter { typedef struct QEMU_PACKED CCID_DataBlock {CCID_BULK_IN b;uint8_t bChainParameter; -uint8_t abData[0 ]; +uint8_t abData[]; } CCID_DataBlock;/* 6.1.4 PC_to_RDR_XfrBlock */ @@ -235,7 +235,7 @@ typedef struct QEMU_PACKED CCID_XferBlock {CCID_Header hdr;uint8_t bBWI;/* Block Waiting Timeout */ uint16_t wLevelParameter;/* XXX currently unused */ -uint8_t abData[0 ]; +uint8_t abData[]; } CCID_XferBlock; typedef struct QEMU_PACKED CCID_IccPowerOn {hw/virtio/virtio.c +2
-2@@ -54,7 +54,7 @@ typedef struct VRingAvail {uint16_t flags;uint16_t idx; -uint16_t ring[0 ]; +uint16_t ring[]; } VRingAvail; typedef struct VRingUsedElem@@ -67,7 +67,7 @@ typedef struct VRingUsed {uint16_t flags;uint16_t idx; -VRingUsedElem ring[0 ]; +VRingUsedElem ring[]; } VRingUsed; typedef struct VRingMemoryRegionCaches {net/queue.c +0
-0
net/queue.c struct NetPacket { · line 52
Quoted 8 lines
net/queue.c +1
-1@@ -46,7 +46,7 @@ struct NetPacket {unsigned flags;int size;NetPacketSent *sent_cb; -uint8_t data[0 ]; +uint8_t data[]; };struct NetQueue {
Signature · 9 lines
Thanks, David / dhildenb _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [PATCH 1/2] misc: Replace zero-length arrays with flexible array member (automatic)
In reply to Philippe Mathieu-DaudéQuoted 82 lines · Philippe Mathieu-Daudé
Description copied from Linux kernel commit from Gustavo A. R. Silva (see [3]):
--v-- description start --v--
The current codebase makes use of the zero-length array language extension to the C90 standard, but the preferred mechanism to declare variable-length types such as these ones is a flexible array member [1], introduced in C99:
struct foo { int stuff; struct boo array[]; };By making use of the mechanism above, we will get a compiler warning in case the flexible array does not occur last in the structure, which will help us prevent some kind of undefined behavior bugs from being unadvertenly introduced [2] to the Linux codebase from now on.
--^-- description end --^--
Do the similar housekeeping in the QEMU codebase (which uses C99 since commit
7be41675f7cb).All these instances of code were found with the help of the following Coccinelle script:
@@ identifier s, a; type T; @@ struct s { ... - T a[0]; + T a[]; }; @@ identifier s, a; type T; @@ struct s { ... - T a[0]; + T a[]; } QEMU_PACKED;[1] https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html
[2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=76497732932f
[3] https://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git/commit/?id=17642a2fbd2c1Inspired-by Gustavo A. R. Silva <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- bsd-user/qemu.h | 2 +- contrib/libvhost-user/libvhost-user.h | 2 +- hw/m68k/bootinfo.h | 2 +- hw/scsi/srp.h | 6 +++--- hw/xen/xen_pt.h | 2 +- include/hw/acpi/acpi-defs.h | 12 ++++++------ include/hw/arm/smmu-common.h | 2 +- include/hw/i386/intel_iommu.h | 3 ++- include/hw/virtio/virtio-iommu.h | 2 +- include/sysemu/cryptodev.h | 2 +- include/tcg/tcg.h | 2 +- pc-bios/s390-ccw/bootmap.h | 2 +- pc-bios/s390-ccw/sclp.h | 2 +- tests/qtest/libqos/ahci.h | 2 +- block/linux-aio.c | 2 +- hw/acpi/nvdimm.c | 6 +++--- hw/dma/soc_dma.c | 2 +- hw/i386/x86.c | 2 +- hw/misc/omap_l4.c | 2 +- hw/nvram/eeprom93xx.c | 2 +- hw/rdma/vmw/pvrdma_qp_ops.c | 4 ++-- hw/usb/dev-network.c | 2 +- hw/usb/dev-smartcard-reader.c | 4 ++-- hw/virtio/virtio.c | 4 ++-- net/queue.c | 2 +- 25 files changed, 38 insertions(+), 37 deletions(-)
[...]
Quoted 23 lines
hw/scsi/srp.h +2
-2@@ -112,7 +112,7 @@ struct srp_direct_buf {struct srp_indirect_buf {struct srp_direct_buf table_desc;uint32_t len; -struct srp_direct_buf desc_list[0 ]; +struct srp_direct_buf desc_list[]; }QEMU_PACKED ;enum {@@ -211,7 +211,7 @@ struct srp_cmd {uint8_t reserved4;uint8_t add_cdb_len;uint8_t cdb[16 ]; -uint8_t add_data[0 ]; +uint8_t add_data[]; }QEMU_PACKED ;enum {
hw/scsi/srp.h struct srp_rsp { · line 245
Quoted 6 lines
hw/scsi/srp.h +1
-1@@ -241,7 +241,7 @@ struct srp_rsp {uint32_t data_in_res_cnt;uint32_t sense_data_len;uint32_t resp_data_len; -uint8_t data[0 ]; +uint8_t data[]; }QEMU_PACKED ;
hw/scsi/spapr_vscsi.c:69:29: error: field 'iu' with variable sized type 'union viosrp_iu' not at the end of a struct or class is a GNU extension [-Werror,-Wgnu-variable-sized-type-not-at-end]
union viosrp_iu iu;
^Yay we found a bug! Thanks Gustavo :)
union srp_iu {
struct srp_login_req login_req;
struct srp_login_rsp login_rsp;
struct srp_login_rej login_rej;
struct srp_i_logout i_logout;
struct srp_t_logout t_logout;
struct srp_tsk_mgmt tsk_mgmt;
struct srp_cmd cmd;
struct srp_rsp rsp;
uint8_t reserved[SRP_MAX_IU_LEN];
};union viosrp_iu {
union srp_iu srp;
union mad_iu mad;
};typedef struct vscsi_req {
vscsi_crq crq;
union viosrp_iu iu;
/* SCSI request tracking */
SCSIRequest *sreq;
uint32_t qtag; /* qemu tag != srp tag */
bool active;
bool writing;
bool dma_error;
uint32_t data_len;
uint32_t senselen;
uint8_t sense[SCSI_SENSE_BUF_SIZE];
/* RDMA related bits */
uint8_t dma_fmt;
uint16_t local_desc;
uint16_t total_desc;
uint16_t cdb_offset;
uint16_t cur_desc_num;
uint16_t cur_desc_offset;
} vscsi_req;hw/scsi/srp.h struct srp_rsp { · line 247
Quoted 2 lines
hw/scsi/srp.h +0
-0#endif /* SCSI_SRP_H */
[...]
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [PATCH 1/2] misc: Replace zero-length arrays with flexible array member (automatic)
Quoted 9 lines · Philippe Mathieu-Daudé
hw/scsi/spapr_vscsi.c:69:29: error: field 'iu' with variable sized type 'unionviosrp_iu' not at the end of a struct or class is a GNU extension [-Werror,-Wgnu-variable-sized-type-not-at-end]
union viosrp_iu iu;
^Yay we found a bug! Thanks Gustavo :)
Quoted 11 lines
union
srp_iu{
structsrp_login_reqlogin_req;
structsrp_login_rsplogin_rsp;
structsrp_login_rejlogin_rej;
structsrp_i_logouti_logout;
structsrp_t_logoutt_logout;
structsrp_tsk_mgmttsk_mgmt;
structsrp_cmdcmd;
structsrp_rsprsp;
uint8_treserved[SRP_MAX_IU_LEN];
};
It's variable-sized but it's okay as long as the total size doesn't exceed SRP_MAX_IU_LEN. So it's not a bug, but I agree it's a time bomb.
Moving the field last should work, but it would still be quite
dangerous code.
Paolo
Re: [PATCH 1/2] misc: Replace zero-length arrays with flexible array member (automatic)
Quoted 22 lines · Paolo Bonzini
Quoted 9 lines · Philippe Mathieu-Daudé
hw/scsi/spapr_vscsi.c:69:29: error: field 'iu' with variable sized type 'unionviosrp_iu' not at the end of a struct or class is a GNU extension [-Werror,-Wgnu-variable-sized-type-not-at-end]
union viosrp_iu iu;
^Yay we found a bug! Thanks Gustavo :)
Quoted 11 lines
union
srp_iu{
structsrp_login_reqlogin_req;
structsrp_login_rsplogin_rsp;
structsrp_login_rejlogin_rej;
structsrp_i_logouti_logout;
structsrp_t_logoutt_logout;
structsrp_tsk_mgmttsk_mgmt;
structsrp_cmdcmd;
structsrp_rsprsp;
uint8_treserved[SRP_MAX_IU_LEN];
};
Quoted 4 lines
It's variable-sized but it's okay as long as the total size doesn't exceed
SRP_MAX_IU_LEN. So it's not a bug, but I agree it's a time bomb.
Moving the field last should work, but it would still be quite
dangerous code.
Yeah I reached the same conclusion.
I'll send a fix for the dangerous code.
Do you want to drop this series, or only the change in 'struct srp_rsp' (or in all hw/scsi/srp.h). Actually I guess it makes sense I move the 'hw/scsi/srp.h' changes with the series cleaning dangerous code.
Re: [PATCH 1/2] misc: Replace zero-length arrays with flexible array member (automatic)
Quoted 4 lines · Philippe Mathieu-Daudé
I'll send a fix for the dangerous code.
Do you want to drop this series, or only the change in 'structsrp_rsp' (or in allhw/scsi/srp.h). Actually I guess it makes sense I move the 'hw/scsi/srp.h' changes with the series cleaning dangerous code.
As you prefer, it's not urgent to merge it.
Paolo
PATCH 2/2 misc: Replace zero-length arrays with flexible array member (manual)
In reply to Philippe Mathieu-DaudéDescription copied from Linux kernel commit from Gustavo A. R. Silva (see [3]):
--v-- description start --v--
The current codebase makes use of the zero-length array language extension to the C90 standard, but the preferred mechanism to declare variable-length types such as these ones is a flexible array member [1], introduced in C99:
struct foo {
int stuff;
struct boo array[];
};By making use of the mechanism above, we will get a compiler warning in case the flexible array does not occur last in the structure, which will help us prevent some kind of undefined behavior bugs from being unadvertenly introduced [2] to the Linux codebase from now on.
--^-- description end --^--
Do the similar housekeeping in the QEMU codebase (which uses C99 since commit 7be41675f7cb).
All these instances of code were found with the help of the following command (then manual analysis):
git grep -F '[0];'
[1] https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html
[2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=76497732932f
[3] https://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git/commit/?id=17642a2fbd2c1
--- docs/interop/vhost-user.rst | 4 ++-- block/qed.h | 2 +- include/hw/acpi/acpi-defs.h | 4 ++-- include/hw/boards.h | 2 +- include/hw/s390x/event-facility.h | 2 +- include/hw/s390x/sclp.h | 8 ++++---- block/vmdk.c | 2 +- hw/char/sclpconsole-lm.c | 2 +- hw/char/sclpconsole.c | 2 +- hw/s390x/virtio-ccw.c | 2 +- target/s390x/ioinst.c | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-)
docs/interop/vhost-user.rst +2 -2
@@ -568,7 +568,7 @@ For split virtqueue, queue region can be implemented as: uint16_t used_idx; /* Used to track the state of each descriptor in descriptor table */ - DescStateSplit desc[0]; + DescStateSplit desc[]; } QueueRegionSplit; To track inflight I/O, the queue region should be processed as follows:
@@ -690,7 +690,7 @@ For packed virtqueue, queue region can be implemented as: uint8_t padding[7]; /* Used to track the state of each descriptor fetched from descriptor ring */ - DescStatePacked desc[0]; + DescStatePacked desc[]; } QueueRegionPacked; To track inflight I/O, the queue region should be processed as follows:
block/qed.h +1 -1
@@ -103,7 +103,7 @@ typedef struct { }QEMU_PACKED QEDHeader;typedef struct { -uint64_t offsets[0 ];/* in bytes */ +uint64_t offsets[];/* in bytes */ }QEDTable ;/* The L2 cache is a simple write-through cache for L2 structures */
include/hw/acpi/acpi-defs.h +2 -2
@@ -152,7 +152,7 @@ typedef struct AcpiSerialPortConsoleRedirection*/ struct AcpiRsdtDescriptorRev1 {ACPI_TABLE_HEADER_DEF /* ACPI common table header */ - uint32_t table_offset_entry[0]; /* Array of pointers to other */ + uint32_t table_offset_entry[]; /* Array of pointers to other *//* ACPI tables */ }QEMU_PACKED ;typedef struct AcpiRsdtDescriptorRev1 AcpiRsdtDescriptorRev1 ;
@@ -162,7 +162,7 @@ typedef struct AcpiRsdtDescriptorRev1 AcpiRsdtDescriptorRev1;*/ struct AcpiXsdtDescriptorRev2 {ACPI_TABLE_HEADER_DEF /* ACPI common table header */ - uint64_t table_offset_entry[0]; /* Array of pointers to other */ + uint64_t table_offset_entry[]; /* Array of pointers to other *//* ACPI tables */ }QEMU_PACKED ;typedef struct AcpiXsdtDescriptorRev2 AcpiXsdtDescriptorRev2 ;
include/hw/boards.h +1 -1
@@ -71,7 +71,7 @@ typedef struct CPUArchId {*/ typedef struct {int len; -CPUArchId cpus[0 ]; +CPUArchId cpus[]; }CPUArchIdList ;/**
include/hw/s390x/event-facility.h +1 -1
@@ -122,7 +122,7 @@ typedef struct MDBO {typedef struct MDB {MdbHeader header; -MDBO mdbo[0 ]; +MDBO mdbo[]; } QEMU_PACKED MDB; typedef struct SclpMsg {
include/hw/s390x/sclp.h +4 -4
@@ -132,7 +132,7 @@ typedef struct ReadInfo {uint16_t highest_cpu;uint8_t _reserved5[124 -122 ];/* 122-123 */ uint32_t hmfai; -struct CPUEntry entries[0 ]; +struct CPUEntry entries[]; }QEMU_PACKED ReadInfo; typedef struct ReadCpuInfo {
@@ -142,7 +142,7 @@ typedef struct ReadCpuInfo {uint16_t nr_standby;/* 12-13 */ uint16_t offset_standby;/* 14-15 */ uint8_t reserved0[24 -16 ];/* 16-23 */ -struct CPUEntry entries[0 ]; +struct CPUEntry entries[]; }QEMU_PACKED ReadCpuInfo; typedef struct ReadStorageElementInfo {
@@ -151,7 +151,7 @@ typedef struct ReadStorageElementInfo {uint16_t assigned;uint16_t standby;uint8_t _reserved0[16 -14 ];/* 14-15 */ -uint32_t entries[0 ]; +uint32_t entries[]; }QEMU_PACKED ReadStorageElementInfo; typedef struct AttachStorageElement {
@@ -159,7 +159,7 @@ typedef struct AttachStorageElement {uint8_t _reserved0[10 -8 ];/* 8-9 */ uint16_t assigned;uint8_t _reserved1[16 -12 ];/* 12-15 */ -uint32_t entries[0 ]; +uint32_t entries[]; }QEMU_PACKED AttachStorageElement; typedef struct AssignStorage {
block/vmdk.c +1 -1
@@ -187,7 +187,7 @@ typedef struct VmdkMetaData {typedef struct VmdkGrainMarker {uint64_t lba;uint32_t size; -uint8_t data[0 ]; +uint8_t data[]; } QEMU_PACKED VmdkGrainMarker;enum {
hw/char/sclpconsole-lm.c +1 -1
@@ -31,7 +31,7 @@typedef struct OprtnsCommand {EventBufferHeader header;MDMSU message_unit; -char data[0 ]; +char data[]; } QEMU_PACKED OprtnsCommand;/* max size for line-mode data in 4K SCCB page */
hw/char/sclpconsole.c +1 -1
@@ -25,7 +25,7 @@typedef struct ASCIIConsoleData {EventBufferHeader ebh; -char data[0 ]; +char data[]; } QEMU_PACKED ASCIIConsoleData;/* max size for ASCII data in 4K SCCB page */
hw/s390x/virtio-ccw.c +1 -1
@@ -193,7 +193,7 @@ typedef struct VirtioThinintInfo {typedef struct VirtioRevInfo {uint16_t revision;uint16_t length; -uint8_t data[0 ]; +uint8_t data[]; } QEMU_PACKED VirtioRevInfo;/* Specify where the virtqueues for the subchannel are in guest memory. */
target/s390x/ioinst.c +1 -1
@@ -347,7 +347,7 @@ typedef struct ChscResp {uint16_t len;uint16_t code;uint32_t param; -char data[0 ]; +char data[]; }QEMU_PACKED ChscResp;#define CHSC_MIN_RESP_LEN 0x0008
Signature · 7 lines
2.21.1 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [PATCH 2/2] misc: Replace zero-length arrays with flexible array member (manual)
Quoted 232 lines · Philippe Mathieu-Daudé
Description copied from Linux kernel commit from Gustavo A. R. Silva (see [3]):
--v-- description start --v--
The current codebase makes use of the zero-length array language extension to the C90 standard, but the preferred mechanism to declare variable-length types such as these ones is a flexible array member [1], introduced in C99:
struct foo { int stuff; struct boo array[]; };By making use of the mechanism above, we will get a compiler warning in case the flexible array does not occur last in the structure, which will help us prevent some kind of undefined behavior bugs from being unadvertenly introduced [2] to the Linux codebase from now on.
--^-- description end --^--
Do the similar housekeeping in the QEMU codebase (which uses C99 since commit
7be41675f7cb).All these instances of code were found with the help of the following command (then manual analysis):
git grep -F '[0];'
[1] https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html
[2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=76497732932f
[3] https://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git/commit/?id=17642a2fbd2c1Inspired-by Gustavo A. R. Silva <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- docs/interop/vhost-user.rst | 4 ++-- block/qed.h | 2 +- include/hw/acpi/acpi-defs.h | 4 ++-- include/hw/boards.h | 2 +- include/hw/s390x/event-facility.h | 2 +- include/hw/s390x/sclp.h | 8 ++++---- block/vmdk.c | 2 +- hw/char/sclpconsole-lm.c | 2 +- hw/char/sclpconsole.c | 2 +- hw/s390x/virtio-ccw.c | 2 +- target/s390x/ioinst.c | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-)docs/interop/vhost-user.rst +2
-2@@ -568,7 +568,7 @@ For split virtqueue, queue region can be implemented as: uint16_t used_idx; /* Used to track the state of each descriptor in descriptor table */ - DescStateSplit desc[0]; + DescStateSplit desc[]; } QueueRegionSplit; To track inflight I/O, the queue region should be processed as follows:@@ -690,7 +690,7 @@ For packed virtqueue, queue region can be implemented as: uint8_t padding[7]; /* Used to track the state of each descriptor fetched from descriptor ring */ - DescStatePacked desc[0]; + DescStatePacked desc[]; } QueueRegionPacked; To track inflight I/O, the queue region should be processed as follows:block/qed.h +1
-1@@ -103,7 +103,7 @@ typedef struct { }QEMU_PACKED QEDHeader;typedef struct { -uint64_t offsets[0 ];/* in bytes */ +uint64_t offsets[];/* in bytes */ }QEDTable ;/* The L2 cache is a simple write-through cache for L2 structures */ include/hw/acpi/acpi-defs.h +2
-2@@ -152,7 +152,7 @@ typedef struct AcpiSerialPortConsoleRedirection*/ struct AcpiRsdtDescriptorRev1 {ACPI_TABLE_HEADER_DEF /* ACPI common table header */ - uint32_t table_offset_entry[0]; /* Array of pointers to other */ + uint32_t table_offset_entry[]; /* Array of pointers to other *//* ACPI tables */ }QEMU_PACKED ;typedef struct AcpiRsdtDescriptorRev1 AcpiRsdtDescriptorRev1 ;@@ -162,7 +162,7 @@ typedef struct AcpiRsdtDescriptorRev1 AcpiRsdtDescriptorRev1;*/ struct AcpiXsdtDescriptorRev2 {ACPI_TABLE_HEADER_DEF /* ACPI common table header */ - uint64_t table_offset_entry[0]; /* Array of pointers to other */ + uint64_t table_offset_entry[]; /* Array of pointers to other *//* ACPI tables */ }QEMU_PACKED ;typedef struct AcpiXsdtDescriptorRev2 AcpiXsdtDescriptorRev2 ;include/hw/boards.h +1
-1@@ -71,7 +71,7 @@ typedef struct CPUArchId {*/ typedef struct {int len; -CPUArchId cpus[0 ]; +CPUArchId cpus[]; }CPUArchIdList ;/** include/hw/s390x/event-facility.h +1
-1@@ -122,7 +122,7 @@ typedef struct MDBO {typedef struct MDB {MdbHeader header; -MDBO mdbo[0 ]; +MDBO mdbo[]; } QEMU_PACKED MDB; typedef struct SclpMsg {include/hw/s390x/sclp.h +4
-4@@ -132,7 +132,7 @@ typedef struct ReadInfo {uint16_t highest_cpu;uint8_t _reserved5[124 -122 ];/* 122-123 */ uint32_t hmfai; -struct CPUEntry entries[0 ]; +struct CPUEntry entries[]; }QEMU_PACKED ReadInfo; typedef struct ReadCpuInfo {@@ -142,7 +142,7 @@ typedef struct ReadCpuInfo {uint16_t nr_standby;/* 12-13 */ uint16_t offset_standby;/* 14-15 */ uint8_t reserved0[24 -16 ];/* 16-23 */ -struct CPUEntry entries[0 ]; +struct CPUEntry entries[]; }QEMU_PACKED ReadCpuInfo; typedef struct ReadStorageElementInfo {@@ -151,7 +151,7 @@ typedef struct ReadStorageElementInfo {uint16_t assigned;uint16_t standby;uint8_t _reserved0[16 -14 ];/* 14-15 */ -uint32_t entries[0 ]; +uint32_t entries[]; }QEMU_PACKED ReadStorageElementInfo; typedef struct AttachStorageElement {@@ -159,7 +159,7 @@ typedef struct AttachStorageElement {uint8_t _reserved0[10 -8 ];/* 8-9 */ uint16_t assigned;uint8_t _reserved1[16 -12 ];/* 12-15 */ -uint32_t entries[0 ]; +uint32_t entries[]; }QEMU_PACKED AttachStorageElement; typedef struct AssignStorage {block/vmdk.c +1
-1@@ -187,7 +187,7 @@ typedef struct VmdkMetaData {typedef struct VmdkGrainMarker {uint64_t lba;uint32_t size; -uint8_t data[0 ]; +uint8_t data[]; } QEMU_PACKED VmdkGrainMarker;enum {hw/char/sclpconsole-lm.c +1
-1@@ -31,7 +31,7 @@typedef struct OprtnsCommand {EventBufferHeader header;MDMSU message_unit; -char data[0 ]; +char data[]; } QEMU_PACKED OprtnsCommand;/* max size for line-mode data in 4K SCCB page */ hw/char/sclpconsole.c +1
-1@@ -25,7 +25,7 @@typedef struct ASCIIConsoleData {EventBufferHeader ebh; -char data[0 ]; +char data[]; } QEMU_PACKED ASCIIConsoleData;/* max size for ASCII data in 4K SCCB page */ hw/s390x/virtio-ccw.c +1
-1@@ -193,7 +193,7 @@ typedef struct VirtioThinintInfo {typedef struct VirtioRevInfo {uint16_t revision;uint16_t length; -uint8_t data[0 ]; +uint8_t data[]; } QEMU_PACKED VirtioRevInfo;/* Specify where the virtqueues for the subchannel are in guest memory. */ target/s390x/ioinst.c +0
-0
target/s390x/ioinst.c typedef struct ChscResp { · line 353
Quoted 8 lines
target/s390x/ioinst.c +1
-1@@ -347,7 +347,7 @@ typedef struct ChscResp {uint16_t len;uint16_t code;uint32_t param; -char data[0 ]; +char data[]; }QEMU_PACKED ChscResp;#define CHSC_MIN_RESP_LEN 0x0008
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH 2/2] misc: Replace zero-length arrays with flexible array member (manual)
In reply to Philippe Mathieu-DaudéQuoted 78 lines · Philippe Mathieu-Daudé
Description copied from Linux kernel commit from Gustavo A. R. Silva (see [3]):
--v-- description start --v--
The current codebase makes use of the zero-length array language extension to the C90 standard, but the preferred mechanism to declare variable-length types such as these ones is a flexible array member [1], introduced in C99:
struct foo { int stuff; struct boo array[]; };By making use of the mechanism above, we will get a compiler warning in case the flexible array does not occur last in the structure, which will help us prevent some kind of undefined behavior bugs from being unadvertenly introduced [2] to the Linux codebase from now on.
--^-- description end --^--
Do the similar housekeeping in the QEMU codebase (which uses C99 since commit
7be41675f7cb).All these instances of code were found with the help of the following command (then manual analysis):
git grep -F '[0];'[1] https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html
[2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=76497732932f
[3] https://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git/commit/?id=17642a2fbd2c1Inspired-by Gustavo A. R. Silva <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- docs/interop/vhost-user.rst | 4 ++-- block/qed.h | 2 +- include/hw/acpi/acpi-defs.h | 4 ++-- include/hw/boards.h | 2 +- include/hw/s390x/event-facility.h | 2 +- include/hw/s390x/sclp.h | 8 ++++---- block/vmdk.c | 2 +- hw/char/sclpconsole-lm.c | 2 +- hw/char/sclpconsole.c | 2 +- hw/s390x/virtio-ccw.c | 2 +- target/s390x/ioinst.c | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-)docs/interop/vhost-user.rst +2
-2@@ -568,7 +568,7 @@ For split virtqueue, queue region can be implemented as: uint16_t used_idx; /* Used to track the state of each descriptor in descriptor table */ - DescStateSplit desc[0]; + DescStateSplit desc[]; } QueueRegionSplit; To track inflight I/O, the queue region should be processed as follows:@@ -690,7 +690,7 @@ For packed virtqueue, queue region can be implemented as: uint8_t padding[7]; /* Used to track the state of each descriptor fetched from descriptor ring */ - DescStatePacked desc[0]; + DescStatePacked desc[]; } QueueRegionPacked; To track inflight I/O, the queue region should be processed as follows:block/qed.h +0
-0
block/qed.h typedef struct { · line 106
Quoted 5 lines
block/qed.h +1
-1@@ -103,7 +103,7 @@ typedef struct { }QEMU_PACKED QEDHeader; typedef struct { - uint64_t offsets[0]; /* in bytes */ + uint64_t offsets[]; /* in bytes */
Apparently this one is incorrect, it triggers:
GCC:block/qed.h:106:14: error: flexible array member in otherwise empty struct
Clang:block/qed.h:106:14: error: flexible array member 'offsets' not allowed in otherwise empty struct
Quoted 157 lines
block/qed.h +0
-0} QEDTable;/* The L2 cache is a simple write-through cache for L2 structures */ include/hw/acpi/acpi-defs.h +2
-2@@ -152,7 +152,7 @@ typedef struct AcpiSerialPortConsoleRedirection*/ struct AcpiRsdtDescriptorRev1 {ACPI_TABLE_HEADER_DEF /* ACPI common table header */ - uint32_t table_offset_entry[0]; /* Array of pointers to other */ + uint32_t table_offset_entry[]; /* Array of pointers to other *//* ACPI tables */ }QEMU_PACKED ;typedef struct AcpiRsdtDescriptorRev1 AcpiRsdtDescriptorRev1 ;@@ -162,7 +162,7 @@ typedef struct AcpiRsdtDescriptorRev1 AcpiRsdtDescriptorRev1;*/ struct AcpiXsdtDescriptorRev2 {ACPI_TABLE_HEADER_DEF /* ACPI common table header */ - uint64_t table_offset_entry[0]; /* Array of pointers to other */ + uint64_t table_offset_entry[]; /* Array of pointers to other *//* ACPI tables */ }QEMU_PACKED ;typedef struct AcpiXsdtDescriptorRev2 AcpiXsdtDescriptorRev2 ;include/hw/boards.h +1
-1@@ -71,7 +71,7 @@ typedef struct CPUArchId {*/ typedef struct {int len; -CPUArchId cpus[0 ]; +CPUArchId cpus[]; }CPUArchIdList ;/** include/hw/s390x/event-facility.h +1
-1@@ -122,7 +122,7 @@ typedef struct MDBO {typedef struct MDB {MdbHeader header; -MDBO mdbo[0 ]; +MDBO mdbo[]; } QEMU_PACKED MDB; typedef struct SclpMsg {include/hw/s390x/sclp.h +4
-4@@ -132,7 +132,7 @@ typedef struct ReadInfo {uint16_t highest_cpu;uint8_t _reserved5[124 -122 ];/* 122-123 */ uint32_t hmfai; -struct CPUEntry entries[0 ]; +struct CPUEntry entries[]; }QEMU_PACKED ReadInfo; typedef struct ReadCpuInfo {@@ -142,7 +142,7 @@ typedef struct ReadCpuInfo {uint16_t nr_standby;/* 12-13 */ uint16_t offset_standby;/* 14-15 */ uint8_t reserved0[24 -16 ];/* 16-23 */ -struct CPUEntry entries[0 ]; +struct CPUEntry entries[]; }QEMU_PACKED ReadCpuInfo; typedef struct ReadStorageElementInfo {@@ -151,7 +151,7 @@ typedef struct ReadStorageElementInfo {uint16_t assigned;uint16_t standby;uint8_t _reserved0[16 -14 ];/* 14-15 */ -uint32_t entries[0 ]; +uint32_t entries[]; }QEMU_PACKED ReadStorageElementInfo; typedef struct AttachStorageElement {@@ -159,7 +159,7 @@ typedef struct AttachStorageElement {uint8_t _reserved0[10 -8 ];/* 8-9 */ uint16_t assigned;uint8_t _reserved1[16 -12 ];/* 12-15 */ -uint32_t entries[0 ]; +uint32_t entries[]; }QEMU_PACKED AttachStorageElement; typedef struct AssignStorage {block/vmdk.c +1
-1@@ -187,7 +187,7 @@ typedef struct VmdkMetaData {typedef struct VmdkGrainMarker {uint64_t lba;uint32_t size; -uint8_t data[0 ]; +uint8_t data[]; } QEMU_PACKED VmdkGrainMarker;enum {hw/char/sclpconsole-lm.c +1
-1@@ -31,7 +31,7 @@typedef struct OprtnsCommand {EventBufferHeader header;MDMSU message_unit; -char data[0 ]; +char data[]; } QEMU_PACKED OprtnsCommand;/* max size for line-mode data in 4K SCCB page */ hw/char/sclpconsole.c +1
-1@@ -25,7 +25,7 @@typedef struct ASCIIConsoleData {EventBufferHeader ebh; -char data[0 ]; +char data[]; } QEMU_PACKED ASCIIConsoleData;/* max size for ASCII data in 4K SCCB page */ hw/s390x/virtio-ccw.c +1
-1@@ -193,7 +193,7 @@ typedef struct VirtioThinintInfo {typedef struct VirtioRevInfo {uint16_t revision;uint16_t length; -uint8_t data[0 ]; +uint8_t data[]; } QEMU_PACKED VirtioRevInfo;/* Specify where the virtqueues for the subchannel are in guest memory. */ target/s390x/ioinst.c +1
-1@@ -347,7 +347,7 @@ typedef struct ChscResp {uint16_t len;uint16_t code;uint32_t param; -char data[0 ]; +char data[]; }QEMU_PACKED ChscResp;#define CHSC_MIN_RESP_LEN 0x0008
Quoted 92 lines · Philippe Mathieu-Daudé
This is a tree-wide cleanup inspired by a Linux kernel commit (from Gustavo A. R. Silva).
--v-- description start --v--
The current codebase makes use of the zero-length array language extension to the C90 standard, but the preferred mechanism to declare variable-length types such as these ones is a flexible array member [1], introduced in C99:
struct foo { int stuff; struct boo array[]; };By making use of the mechanism above, we will get a compiler warning in case the flexible array does not occur last in the structure, which will help us prevent some kind of undefined behavior bugs from being unadvertenly introduced [2] to the Linux codebase from now on.
--^-- description end --^--
Do the similar housekeeping in the QEMU codebase (which uses C99 since commit
7be41675f7cb).The first patch is done with the help of a coccinelle semantic patch. However Coccinelle does not recognize:
struct foo { int stuff; struct boo array[]; } QEMU_PACKED;but does recognize:
struct QEMU_PACKED foo { int stuff; struct boo array[]; };I'm not sure why, neither it is worth refactoring all QEMU structures to use the attributes before the structure name, so I did the 2nd patch manually.
Anyway this is annoying, because many structures are not handled by coccinelle. Maybe this needs to be reported to upstream coccinelle?
I used spatch 1.0.8 with:
-I include --include-headers \ --macro-file scripts/cocci-macro-file.h \ --keep-comments --indent 4Regards,
Phil.
Philippe Mathieu-Daudé (2):
misc: Replace zero-length arrays with flexible array member
(automatic)
misc: Replace zero-length arrays with flexible array member (manual)docs/interop/vhost-user.rst | 4 ++-- block/qed.h | 2 +- bsd-user/qemu.h | 2 +- contrib/libvhost-user/libvhost-user.h | 2 +- hw/m68k/bootinfo.h | 2 +- hw/scsi/srp.h | 6 +++--- hw/xen/xen_pt.h | 2 +- include/hw/acpi/acpi-defs.h | 16 ++++++++-------- include/hw/arm/smmu-common.h | 2 +- include/hw/boards.h | 2 +- include/hw/i386/intel_iommu.h | 3 ++- include/hw/s390x/event-facility.h | 2 +- include/hw/s390x/sclp.h | 8 ++++---- include/hw/virtio/virtio-iommu.h | 2 +- include/sysemu/cryptodev.h | 2 +- include/tcg/tcg.h | 2 +- pc-bios/s390-ccw/bootmap.h | 2 +- pc-bios/s390-ccw/sclp.h | 2 +- tests/qtest/libqos/ahci.h | 2 +- block/linux-aio.c | 2 +- block/vmdk.c | 2 +- hw/acpi/nvdimm.c | 6 +++--- hw/char/sclpconsole-lm.c | 2 +- hw/char/sclpconsole.c | 2 +- hw/dma/soc_dma.c | 2 +- hw/i386/x86.c | 2 +- hw/misc/omap_l4.c | 2 +- hw/nvram/eeprom93xx.c | 2 +-
Quoted 9 lines
hw/rdma/vmw/pvrdma_qp_ops.c | 4 ++-- hw/s390x/virtio-ccw.c | 2 +- hw/usb/dev-network.c | 2 +- hw/usb/dev-smartcard-reader.c | 4 ++-- hw/virtio/virtio.c | 4 ++-- net/queue.c | 2 +- target/s390x/ioinst.c | 2 +- 35 files changed, 54 insertions(+), 53 deletions(-)
Queued (minus the qed part).
Paolo