Commit 2c407aca authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Pablo Neira Ayuso

netfilter: conntrack: avoid gcc-10 zero-length-bounds warning

gcc-10 warns around a suspicious access to an empty struct member:

net/netfilter/nf_conntrack_core.c: In function '__nf_conntrack_alloc':
net/netfilter/nf_conntrack_core.c:1522:9: warning: array subscript 0 is outside the bounds of an interior zero-length array 'u8[0]' {aka 'unsigned char[0]'} [-Wzero-length-bounds]
 1522 |  memset(&ct->__nfct_init_offset[0], 0,
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from net/netfilter/nf_conntrack_core.c:37:
include/net/netfilter/nf_conntrack.h:90:5: note: while referencing '__nfct_init_offset'
   90 |  u8 __nfct_init_offset[0];
      |     ^~~~~~~~~~~~~~~~~~

The code is correct but a bit unusual. Rework it slightly in a way that
does not trigger the warning, using an empty struct instead of an empty
array. There are probably more elegant ways to do this, but this is the
smallest change.

Fixes: c41884ce ("netfilter: conntrack: avoid zeroing timer")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 3047211c
...@@ -87,7 +87,7 @@ struct nf_conn { ...@@ -87,7 +87,7 @@ struct nf_conn {
struct hlist_node nat_bysource; struct hlist_node nat_bysource;
#endif #endif
/* all members below initialized via memset */ /* all members below initialized via memset */
u8 __nfct_init_offset[0]; struct { } __nfct_init_offset;
/* If we were expected by an expectation, this will be it */ /* If we were expected by an expectation, this will be it */
struct nf_conn *master; struct nf_conn *master;
......
...@@ -1519,9 +1519,9 @@ __nf_conntrack_alloc(struct net *net, ...@@ -1519,9 +1519,9 @@ __nf_conntrack_alloc(struct net *net,
ct->status = 0; ct->status = 0;
ct->timeout = 0; ct->timeout = 0;
write_pnet(&ct->ct_net, net); write_pnet(&ct->ct_net, net);
memset(&ct->__nfct_init_offset[0], 0, memset(&ct->__nfct_init_offset, 0,
offsetof(struct nf_conn, proto) - offsetof(struct nf_conn, proto) -
offsetof(struct nf_conn, __nfct_init_offset[0])); offsetof(struct nf_conn, __nfct_init_offset));
nf_ct_zone_add(ct, zone); nf_ct_zone_add(ct, zone);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment