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

net: mpls: 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
680a9316 95e486f5

+3 -3
+1 -1
include/net/mpls_iptunnel.h
··· 11 11 u8 ttl_propagate; 12 12 u8 default_ttl; 13 13 u8 reserved1; 14 - u32 label[0]; 14 + u32 label[]; 15 15 }; 16 16 17 17 static inline struct mpls_iptunnel_encap *mpls_lwtunnel_encap(struct lwtunnel_state *lwtstate)
+2 -2
net/mpls/internal.h
··· 98 98 u8 nh_via_table; 99 99 u8 nh_reserved1; 100 100 101 - u32 nh_label[0]; 101 + u32 nh_label[]; 102 102 }; 103 103 104 104 /* offset of via from beginning of mpls_nh */ ··· 154 154 u8 rt_nh_size; 155 155 u8 rt_via_offset; 156 156 u8 rt_reserved1; 157 - struct mpls_nh rt_nh[0]; 157 + struct mpls_nh rt_nh[]; 158 158 }; 159 159 160 160 #define for_nexthops(rt) { \