From: "GONG, Ruiqi" <gongrui...@huawei.com>

As suggested by Kees[1], replace the old-style 0-element array members
of multiple structs in ebtables.h with modern C99 flexible array.

[1]: 
https://lore.kernel.org/all/5e8e0f9c-ee3f-4b0d-b827-dc47397e2...@kernel.org/

Link: https://github.com/KSPP/linux/issues/21
Signed-off-by: GONG, Ruiqi <gongrui...@huawei.com>
Reviewed-by: Kees Cook <keesc...@chromium.org>
---

v2: designate to net-next; cc more netdev maintainers

 include/uapi/linux/netfilter_bridge/ebtables.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/uapi/linux/netfilter_bridge/ebtables.h 
b/include/uapi/linux/netfilter_bridge/ebtables.h
index b0caad82b693..673b00df162c 100644
--- a/include/uapi/linux/netfilter_bridge/ebtables.h
+++ b/include/uapi/linux/netfilter_bridge/ebtables.h
@@ -87,7 +87,7 @@ struct ebt_entries {
        /* nr. of entries */
        unsigned int nentries;
        /* entry list */
-       char data[0] __attribute__ ((aligned (__alignof__(struct 
ebt_replace))));
+       char data[] __attribute__ ((aligned (__alignof__(struct ebt_replace))));
 };
 
 /* used for the bitmask of struct ebt_entry */
@@ -129,7 +129,7 @@ struct ebt_entry_match {
        } u;
        /* size of data */
        unsigned int match_size;
-       unsigned char data[0] __attribute__ ((aligned (__alignof__(struct 
ebt_replace))));
+       unsigned char data[] __attribute__ ((aligned (__alignof__(struct 
ebt_replace))));
 };
 
 struct ebt_entry_watcher {
@@ -142,7 +142,7 @@ struct ebt_entry_watcher {
        } u;
        /* size of data */
        unsigned int watcher_size;
-       unsigned char data[0] __attribute__ ((aligned (__alignof__(struct 
ebt_replace))));
+       unsigned char data[] __attribute__ ((aligned (__alignof__(struct 
ebt_replace))));
 };
 
 struct ebt_entry_target {
@@ -155,7 +155,7 @@ struct ebt_entry_target {
        } u;
        /* size of data */
        unsigned int target_size;
-       unsigned char data[0] __attribute__ ((aligned (__alignof__(struct 
ebt_replace))));
+       unsigned char data[] __attribute__ ((aligned (__alignof__(struct 
ebt_replace))));
 };
 
 #define EBT_STANDARD_TARGET "standard"
@@ -190,7 +190,7 @@ struct ebt_entry {
                /* sizeof ebt_entry + matches + watchers + target */
                unsigned int next_offset;
        );
-       unsigned char elems[0] __attribute__ ((aligned (__alignof__(struct 
ebt_replace))));
+       unsigned char elems[] __attribute__ ((aligned (__alignof__(struct 
ebt_replace))));
 };
 
 static __inline__ struct ebt_entry_target *
-- 
2.41.0

Reply via email to