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

net: ipv6: rpl_iptunnel: Replace 0-length arrays with flexible arrays

Zero-length arrays are deprecated[1]. Replace struct ipv6_rpl_sr_hdr's
"segments" union of 0-length arrays with flexible arrays. Detected with
GCC 13, using -fstrict-flex-arrays=3:

In function 'rpl_validate_srh',
inlined from 'rpl_build_state' at ../net/ipv6/rpl_iptunnel.c:96:7:
../net/ipv6/rpl_iptunnel.c:60:28: warning: array subscript <unknown> is outside array bounds of 'struct in6_addr[0]' [-Warray-bounds=]
60 | if (ipv6_addr_type(&srh->rpl_segaddr[srh->segments_left - 1]) &
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../include/net/rpl.h:12,
from ../net/ipv6/rpl_iptunnel.c:13:
../include/uapi/linux/rpl.h: In function 'rpl_build_state':
../include/uapi/linux/rpl.h:40:33: note: while referencing 'addr'
40 | struct in6_addr addr[0];
| ^~~~

[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#zero-length-and-one-element-arrays

Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: David Ahern <dsahern@kernel.org>
Link: https://lore.kernel.org/r/20230105221533.never.711-kees@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Kees Cook and committed by
Jakub Kicinski
e8d283b6 0b5dfa35

+3 -3
+2 -2
include/uapi/linux/rpl.h
··· 37 37 #endif 38 38 39 39 union { 40 - struct in6_addr addr[0]; 41 - __u8 data[0]; 40 + __DECLARE_FLEX_ARRAY(struct in6_addr, addr); 41 + __DECLARE_FLEX_ARRAY(__u8, data); 42 42 } segments; 43 43 } __attribute__((packed)); 44 44
+1 -1
net/ipv6/rpl_iptunnel.c
··· 13 13 #include <net/rpl.h> 14 14 15 15 struct rpl_iptunnel_encap { 16 - struct ipv6_rpl_sr_hdr srh[0]; 16 + DECLARE_FLEX_ARRAY(struct ipv6_rpl_sr_hdr, srh); 17 17 }; 18 18 19 19 struct rpl_lwt {