lkml.org 
[lkml]   [2023]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] net: ipv6: rpl_iptunnel: Replace 0-length arrays with flexible arrays
On Thu, Jan 05, 2023 at 02:15:37PM -0800, Kees Cook wrote:
> 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: "David S. Miller" <davem@davemloft.net>
> Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
> Cc: David Ahern <dsahern@kernel.org>
> Cc: Eric Dumazet <edumazet@google.com>
> Cc: Jakub Kicinski <kuba@kernel.org>
> Cc: Paolo Abeni <pabeni@redhat.com>
> Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org>
> Cc: netdev@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>

Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>

Thanks!
--
Gustavo

> ---
> include/uapi/linux/rpl.h | 4 ++--
> net/ipv6/rpl_iptunnel.c | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/include/uapi/linux/rpl.h b/include/uapi/linux/rpl.h
> index 708adddf9f13..7c8970e5b84b 100644
> --- a/include/uapi/linux/rpl.h
> +++ b/include/uapi/linux/rpl.h
> @@ -37,8 +37,8 @@ struct ipv6_rpl_sr_hdr {
> #endif
>
> union {
> - struct in6_addr addr[0];
> - __u8 data[0];
> + __DECLARE_FLEX_ARRAY(struct in6_addr, addr);
> + __DECLARE_FLEX_ARRAY(__u8, data);
> } segments;
> } __attribute__((packed));
>
> diff --git a/net/ipv6/rpl_iptunnel.c b/net/ipv6/rpl_iptunnel.c
> index ff691d9f4a04..b1c028df686e 100644
> --- a/net/ipv6/rpl_iptunnel.c
> +++ b/net/ipv6/rpl_iptunnel.c
> @@ -13,7 +13,7 @@
> #include <net/rpl.h>
>
> struct rpl_iptunnel_encap {
> - struct ipv6_rpl_sr_hdr srh[0];
> + DECLARE_FLEX_ARRAY(struct ipv6_rpl_sr_hdr, srh);
> };
>
> struct rpl_lwt {
> --
> 2.34.1
>

\
 
 \ /
  Last update: 2023-03-26 23:31    [W:0.898 / U:0.008 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site