Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

netdevice: 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 76497732932f ("cxgb3/l2t: Fix undefined behaviour")

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Gustavo A. R. Silva and committed by
David S. Miller
bb4cf02d 6f2f92a9

+5 -5
+5 -5
include/linux/netdevice.h
··· 664 664 struct rps_map { 665 665 unsigned int len; 666 666 struct rcu_head rcu; 667 - u16 cpus[0]; 667 + u16 cpus[]; 668 668 }; 669 669 #define RPS_MAP_SIZE(_num) (sizeof(struct rps_map) + ((_num) * sizeof(u16))) 670 670 ··· 686 686 struct rps_dev_flow_table { 687 687 unsigned int mask; 688 688 struct rcu_head rcu; 689 - struct rps_dev_flow flows[0]; 689 + struct rps_dev_flow flows[]; 690 690 }; 691 691 #define RPS_DEV_FLOW_TABLE_SIZE(_num) (sizeof(struct rps_dev_flow_table) + \ 692 692 ((_num) * sizeof(struct rps_dev_flow))) ··· 704 704 struct rps_sock_flow_table { 705 705 u32 mask; 706 706 707 - u32 ents[0] ____cacheline_aligned_in_smp; 707 + u32 ents[] ____cacheline_aligned_in_smp; 708 708 }; 709 709 #define RPS_SOCK_FLOW_TABLE_SIZE(_num) (offsetof(struct rps_sock_flow_table, ents[_num])) 710 710 ··· 767 767 unsigned int len; 768 768 unsigned int alloc_len; 769 769 struct rcu_head rcu; 770 - u16 queues[0]; 770 + u16 queues[]; 771 771 }; 772 772 #define XPS_MAP_SIZE(_num) (sizeof(struct xps_map) + ((_num) * sizeof(u16))) 773 773 #define XPS_MIN_MAP_ALLOC ((L1_CACHE_ALIGN(offsetof(struct xps_map, queues[1])) \ ··· 778 778 */ 779 779 struct xps_dev_maps { 780 780 struct rcu_head rcu; 781 - struct xps_map __rcu *attr_map[0]; /* Either CPUs map or RXQs map */ 781 + struct xps_map __rcu *attr_map[]; /* Either CPUs map or RXQs map */ 782 782 }; 783 783 784 784 #define XPS_CPU_DEV_MAPS_SIZE(_tcs) (sizeof(struct xps_dev_maps) + \