Message ID | YzIvfGXxfjdXmIS3@work (mailing list archive) |
---|---|
State | Accepted |
Commit | 63a8bf85568b30438431d4d78afb2fde4a280760 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [next] netns: Replace zero-length array with DECLARE_FLEX_ARRAY() helper | expand |
On Mon, Sep 26, 2022 at 06:02:20PM -0500, Gustavo A. R. Silva wrote: > Zero-length arrays are deprecated and we are moving towards adopting > C99 flexible-array members, instead. So, replace zero-length arrays > declarations in anonymous union with the new DECLARE_FLEX_ARRAY() > helper macro. > > This helper allows for flexible-array members in unions. > > Link: https://github.com/KSPP/linux/issues/193 > Link: https://github.com/KSPP/linux/issues/225 > Link: https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html > Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org> Thanks! Yeah, I tripped over this one myself while testing -fstrict-flex-arrays. Reviewed-by: Kees Cook <keescook@chromium.org>
diff --git a/include/net/netns/generic.h b/include/net/netns/generic.h index 7ce68183f6e1..00c399edeed1 100644 --- a/include/net/netns/generic.h +++ b/include/net/netns/generic.h @@ -33,7 +33,7 @@ struct net_generic { struct rcu_head rcu; } s; - void *ptr[0]; + DECLARE_FLEX_ARRAY(void *, ptr); }; };
Zero-length arrays are deprecated and we are moving towards adopting C99 flexible-array members, instead. So, replace zero-length arrays declarations in anonymous union with the new DECLARE_FLEX_ARRAY() helper macro. This helper allows for flexible-array members in unions. Link: https://github.com/KSPP/linux/issues/193 Link: https://github.com/KSPP/linux/issues/225 Link: https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org> --- include/net/netns/generic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)