netfilter: include: uapi: Use C99 flexible array member
Phil Sutter
reviewerPATCH 1/1 netfilter: include: uapi: Use C99 flexible array member
Recent versions of gcc started to complain about the old-style zero-length array as last member of structs ipt_replace and ip6t_replace. For instance, while compiling iptables:
| In file included from /usr/include/string.h:495, | from libip4tc.c:15: | In function 'memcpy', | inlined from 'iptcc_compile_chain' at libiptc.c:1172:2, | inlined from 'iptcc_compile_table' at libiptc.c:1243:13, | inlined from 'iptc_commit' at libiptc.c:2572:8, | inlined from 'iptc_commit' at libiptc.c:2510:1: | /usr/include/bits/string_fortified.h:34:10: warning: writing 16 bytes into a region of size 0 [-Wstringop-overflow=] | 34 | return __builtin___memcpy_chk (__dest, __src, __len, __bos0 (__dest)); | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | In file included from ../include/libiptc/libiptc.h:12, | from libip4tc.c:29: | libiptc.c: In function 'iptc_commit': | ../include/linux/netfilter_ipv4/ip_tables.h:202:19: note: at offset 0 to object 'entries' with size 0 declared here | 202 | struct ipt_entry entries[0]; | | ^~~~~~~
(Similar for libip6tc.c.)
Avoid this warning by declaring 'entries' as an ISO C99 flexible array member. This makes gcc aware of the intended use and enables sanity checking as described in:
https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html
--- include/uapi/linux/netfilter_ipv4/ip_tables.h | 2 +- include/uapi/linux/netfilter_ipv6/ip6_tables.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/uapi/linux/netfilter_ipv4/ip_tables.h +1 -1
@@ -203,7 +203,7 @@ struct ipt_replace {struct xt_counters __user *counters;/* The entries (hang off end: not really an array). */ -struct ipt_entry entries[0 ]; +struct ipt_entry entries[]; };/* The argument to IPT_SO_GET_ENTRIES. */
include/uapi/linux/netfilter_ipv6/ip6_tables.h +1 -1
@@ -243,7 +243,7 @@ struct ip6t_replace {struct xt_counters __user *counters;/* The entries (hang off end: not really an array). */ -struct ip6t_entry entries[0 ]; +struct ip6t_entry entries[]; };/* The argument to IP6T_SO_GET_ENTRIES. */
Signature · 1 line
2.27.0
Pablo Neira Ayuso
maintainerHi Phil,
On Mon, Jul 13, 2020 at 01:15:52PM +0200, Phil Sutter wrote:
[...]
Quoted 16 lines
Avoid this warning by declaring 'entries' as an ISO C99 flexible array member. This makes gcc aware of the intended use and enables sanity checking as described in:
https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.htmlSigned-off-by Phil Sutter <[email protected]>--- include/uapi/linux/netfilter_ipv4/ip_tables.h | 2 +- include/uapi/linux/netfilter_ipv6/ip6_tables.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)include/uapi/linux/netfilter_ipv4/ip_tables.h +0
-0
include/uapi/linux/netfilter_ipv4/ip_tables.h struct ipt_replace { · line 206
Quoted 5 lines
include/uapi/linux/netfilter_ipv4/ip_tables.h +1
-1@@ -203,7 +203,7 @@ struct ipt_replace {struct xt_counters __user *counters;/* The entries (hang off end: not really an array). */ -struct ipt_entry entries[0 ]; +struct ipt_entry entries[];
arpt_replace uses this idiom too.
Phil Sutter
reviewerHi Pablo,
Quoted 20 lines · Pablo Neira Ayuso
On Mon, Jul 13, 2020 at 01:15:52PM +0200, Phil Sutter wrote:
[...]Quoted 18 lines
Avoid this warning by declaring 'entries' as an ISO C99 flexible array member. This makes gcc aware of the intended use and enables sanity checking as described in:
https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.htmlSigned-off-by Phil Sutter <[email protected]>--- include/uapi/linux/netfilter_ipv4/ip_tables.h | 2 +- include/uapi/linux/netfilter_ipv6/ip6_tables.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)include/uapi/linux/netfilter_ipv4/ip_tables.h +0
-0@@ -203,7 +203,7 @@ struct ipt_replace {struct xt_counters __user *counters;
Quoted 5 lines
include/uapi/linux/netfilter_ipv4/ip_tables.h struct ipt_replace { · line 206
Quoted 3 lines
include/uapi/linux/netfilter_ipv4/ip_tables.h +1
-1/* The entries (hang off end: not really an array). */ -struct ipt_entry entries[0 ]; +struct ipt_entry entries[];
arpt_replaceuses this idiom too.
Oh, indeed. I focussed on those cases gcc complained about when compiling iptables. Grepping for '\[0\]' in all of include/uapi/linux/netfilter* reveals a few more cases. Do you think it's worth "fixing" those as well?
Thanks, Phil
Pablo Neira Ayuso
maintainerQuoted 29 lines · Phil Sutter
Hi Pablo,
Quoted 20 lines · Pablo Neira Ayuso
On Mon, Jul 13, 2020 at 01:15:52PM +0200, Phil Sutter wrote:
[...]Quoted 18 lines
Avoid this warning by declaring 'entries' as an ISO C99 flexible array member. This makes gcc aware of the intended use and enables sanity checking as described in:
https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.htmlSigned-off-by Phil Sutter <[email protected]>--- include/uapi/linux/netfilter_ipv4/ip_tables.h | 2 +- include/uapi/linux/netfilter_ipv6/ip6_tables.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)include/uapi/linux/netfilter_ipv4/ip_tables.h +0
-0@@ -203,7 +203,7 @@ struct ipt_replace {struct xt_counters __user *counters;Quoted 5 lines
include/uapi/linux/netfilter_ipv4/ip_tables.h struct ipt_replace { · line 206
Quoted 3 lines
include/uapi/linux/netfilter_ipv4/ip_tables.h +1
-1/* The entries (hang off end: not really an array). */ -struct ipt_entry entries[0 ]; +struct ipt_entry entries[];
arpt_replaceuses this idiom too.
Quoted 4 lines
Oh, indeed. I focussed on those cases gcc complained about when compiling iptables. Grepping for '\[0\]' in all of
include/uapi/linux/netfilter*reveals a few more cases. Do you think it's worth "fixing" those as well?
It seems this patch was missing a few spots, right?
commit 6daf14140129d30207ed6a0a69851fa6a3636bda
Author: Gustavo A. R. Silva <[email protected]> Date: Thu Feb 20 07:59:14 2020 -0600
netfilter: Replace zero-length array with flexible-array member
Probably Cc: Gustavo to confirm this.