Commit 65dc2f1a authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by David S. Miller

chelsio: Replace zero-length array with flexible-array member

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][2],
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
inadvertently introduced[3] to the codebase from now on.

Also, notice that, dynamic memory allocations won't be affected by
this change:

"Flexible array members have incomplete type, and so the sizeof operator
may not be applied. As a quirk of the original implementation of
zero-length arrays, sizeof evaluates to zero."[1]

This issue was found with the help of Coccinelle.

[1] https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html
[2] https://github.com/KSPP/linux/issues/21
[3] commit 76497732 ("cxgb3/l2t: Fix undefined behaviour")
Signed-off-by: default avatarGustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 59bc954c
...@@ -79,7 +79,7 @@ struct ch_mem_range { ...@@ -79,7 +79,7 @@ struct ch_mem_range {
uint32_t addr; uint32_t addr;
uint32_t len; uint32_t len;
uint32_t version; uint32_t version;
uint8_t buf[0]; uint8_t buf[];
}; };
struct ch_qset_params { struct ch_qset_params {
......
...@@ -1448,7 +1448,7 @@ struct cpl_rdma_terminate { ...@@ -1448,7 +1448,7 @@ struct cpl_rdma_terminate {
#endif #endif
__be32 msn; __be32 msn;
__be32 mo; __be32 mo;
__u8 data[0]; __u8 data[];
}; };
/* cpl_rdma_terminate.tid_len fields */ /* cpl_rdma_terminate.tid_len fields */
......
...@@ -29,7 +29,7 @@ struct clip_tbl { ...@@ -29,7 +29,7 @@ struct clip_tbl {
atomic_t nfree; atomic_t nfree;
struct list_head ce_free_head; struct list_head ce_free_head;
void *cl_list; void *cl_list;
struct list_head hash_list[0]; struct list_head hash_list[];
}; };
enum { enum {
......
...@@ -82,7 +82,7 @@ struct cudbg_ulprx_la { ...@@ -82,7 +82,7 @@ struct cudbg_ulprx_la {
struct cudbg_tp_la { struct cudbg_tp_la {
u32 size; u32 size;
u32 mode; u32 mode;
u8 data[0]; u8 data[];
}; };
static const char * const cudbg_region[] = { static const char * const cudbg_region[] = {
...@@ -134,7 +134,7 @@ struct cudbg_meminfo { ...@@ -134,7 +134,7 @@ struct cudbg_meminfo {
struct cudbg_cim_pif_la { struct cudbg_cim_pif_la {
int size; int size;
u8 data[0]; u8 data[];
}; };
struct cudbg_clk_info { struct cudbg_clk_info {
...@@ -339,13 +339,13 @@ struct cudbg_qdesc_entry { ...@@ -339,13 +339,13 @@ struct cudbg_qdesc_entry {
u32 qid; u32 qid;
u32 desc_size; u32 desc_size;
u32 num_desc; u32 num_desc;
u8 data[0]; /* Must be last */ u8 data[]; /* Must be last */
}; };
struct cudbg_qdesc_info { struct cudbg_qdesc_info {
u32 qdesc_entry_size; u32 qdesc_entry_size;
u32 num_queues; u32 num_queues;
u8 data[0]; /* Must be last */ u8 data[]; /* Must be last */
}; };
#define IREG_NUM_ELEM 4 #define IREG_NUM_ELEM 4
......
...@@ -984,7 +984,7 @@ static const char * const devlog_facility_strings[] = { ...@@ -984,7 +984,7 @@ static const char * const devlog_facility_strings[] = {
struct devlog_info { struct devlog_info {
unsigned int nentries; /* number of entries in log[] */ unsigned int nentries; /* number of entries in log[] */
unsigned int first; /* first [temporal] entry in log[] */ unsigned int first; /* first [temporal] entry in log[] */
struct fw_devlog_e log[0]; /* Firmware Device Log */ struct fw_devlog_e log[]; /* Firmware Device Log */
}; };
/* Dump a Firmaware Device Log entry. /* Dump a Firmaware Device Log entry.
......
...@@ -49,7 +49,7 @@ struct seq_tab { ...@@ -49,7 +49,7 @@ struct seq_tab {
unsigned int rows; /* # of entries */ unsigned int rows; /* # of entries */
unsigned char width; /* size in bytes of each entry */ unsigned char width; /* size in bytes of each entry */
unsigned char skip_first; /* whether the first line is a header */ unsigned char skip_first; /* whether the first line is a header */
char data[0]; /* the table data */ char data[]; /* the table data */
}; };
static inline unsigned int hex2val(char c) static inline unsigned int hex2val(char c)
......
...@@ -289,6 +289,6 @@ struct cxgb4_link { ...@@ -289,6 +289,6 @@ struct cxgb4_link {
struct cxgb4_tc_u32_table { struct cxgb4_tc_u32_table {
unsigned int size; /* number of entries in table */ unsigned int size; /* number of entries in table */
struct cxgb4_link table[0]; /* Jump table */ struct cxgb4_link table[]; /* Jump table */
}; };
#endif /* __CXGB4_TC_U32_PARSE_H */ #endif /* __CXGB4_TC_U32_PARSE_H */
...@@ -59,7 +59,7 @@ struct l2t_data { ...@@ -59,7 +59,7 @@ struct l2t_data {
rwlock_t lock; rwlock_t lock;
atomic_t nfree; /* number of free entries */ atomic_t nfree; /* number of free entries */
struct l2t_entry *rover; /* starting point for next allocation */ struct l2t_entry *rover; /* starting point for next allocation */
struct l2t_entry l2tab[0]; /* MUST BE LAST */ struct l2t_entry l2tab[]; /* MUST BE LAST */
}; };
static inline unsigned int vlan_prio(const struct l2t_entry *e) static inline unsigned int vlan_prio(const struct l2t_entry *e)
......
...@@ -82,7 +82,7 @@ struct sched_class { ...@@ -82,7 +82,7 @@ struct sched_class {
struct sched_table { /* per port scheduling table */ struct sched_table { /* per port scheduling table */
u8 sched_size; u8 sched_size;
struct sched_class tab[0]; struct sched_class tab[];
}; };
static inline bool can_sched(struct net_device *dev) static inline bool can_sched(struct net_device *dev)
......
...@@ -66,7 +66,7 @@ struct smt_entry { ...@@ -66,7 +66,7 @@ struct smt_entry {
struct smt_data { struct smt_data {
unsigned int smt_size; unsigned int smt_size;
rwlock_t lock; rwlock_t lock;
struct smt_entry smtab[0]; struct smt_entry smtab[];
}; };
struct smt_data *t4_init_smt(void); struct smt_data *t4_init_smt(void);
......
...@@ -1511,7 +1511,7 @@ struct ulptx_sgl { ...@@ -1511,7 +1511,7 @@ struct ulptx_sgl {
__be32 cmd_nsge; __be32 cmd_nsge;
__be32 len0; __be32 len0;
__be64 addr0; __be64 addr0;
struct ulptx_sge_pair sge[0]; struct ulptx_sge_pair sge[];
}; };
struct ulptx_idata { struct ulptx_idata {
......
...@@ -737,7 +737,7 @@ struct fw_flowc_mnemval { ...@@ -737,7 +737,7 @@ struct fw_flowc_mnemval {
struct fw_flowc_wr { struct fw_flowc_wr {
__be32 op_to_nparams; __be32 op_to_nparams;
__be32 flowid_len16; __be32 flowid_len16;
struct fw_flowc_mnemval mnemval[0]; struct fw_flowc_mnemval mnemval[];
}; };
#define FW_FLOWC_WR_NPARAMS_S 0 #define FW_FLOWC_WR_NPARAMS_S 0
......
...@@ -122,7 +122,7 @@ struct cxgbi_ppm_pool { ...@@ -122,7 +122,7 @@ struct cxgbi_ppm_pool {
unsigned int base; /* base index */ unsigned int base; /* base index */
unsigned int next; /* next possible free index */ unsigned int next; /* next possible free index */
spinlock_t lock; /* ppm pool lock */ spinlock_t lock; /* ppm pool lock */
unsigned long bmap[0]; unsigned long bmap[];
} ____cacheline_aligned_in_smp; } ____cacheline_aligned_in_smp;
struct cxgbi_ppm { struct cxgbi_ppm {
...@@ -145,7 +145,7 @@ struct cxgbi_ppm { ...@@ -145,7 +145,7 @@ struct cxgbi_ppm {
unsigned int next; unsigned int next;
unsigned int max_index_in_edram; unsigned int max_index_in_edram;
unsigned long *ppod_bmap; unsigned long *ppod_bmap;
struct cxgbi_ppod_data ppod_data[0]; struct cxgbi_ppod_data ppod_data[];
}; };
#define DDP_THRESHOLD 512 #define DDP_THRESHOLD 512
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment