Skip to contentSkip to conversation

ethtool: Replace 0-length array with flexible array

PATCH In review Kees Cook 2 participants 3 messages Jan 5, 2023

Subsystems (2)
lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 ethtool: Replace 0-length array with flexible array

Zero-length arrays are deprecated[1]. Replace struct ethtool_rxnfc's "rule_locs" 0-length array with a flexible array. Detected with GCC 13, using -fstrict-flex-arrays=3:

net/ethtool/common.c: In function 'ethtool_get_max_rxnfc_channel':
net/ethtool/common.c:558:55: warning: array subscript i is outside array bounds of '__u32[0]' {aka 'unsigned int[]'} [-Warray-bounds=]
558 | .fs.location = info->rule_locs[i],

      |                                        ~~~~~~~~~~~~~~~^~~

In file included from include/linux/ethtool.h:19,
from include/uapi/linux/ethtool_netlink.h:12, from include/linux/ethtool_netlink.h:6, from net/ethtool/common.c:3:
include/uapi/linux/ethtool.h:1186:41: note: while referencing 'rule_locs'

 1186 |         __u32                           rule_locs[0];
      |                                         ^~~~~~~~~

[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#zero-length-and-one-element-arrays

Cc "David S. Miller" <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc Andrew Lunn <[email protected]>
Cc kernel test robot <[email protected]>
Cc Oleksij Rempel <[email protected]>
Cc Sean Anderson <[email protected]>
Cc Alexandru Tachici <[email protected]>
Cc Amit Cohen <[email protected]>
Cc "Gustavo A. R. Silva" <[email protected]>
Cc Vincent Mailhol <[email protected]>
---
 include/uapi/linux/ethtool.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/linux/ethtool.h +1 -1
index 58e587ba0450..9b97b3e0ec1f 100644
@@ -1183,7 +1183,7 @@ struct ethtool_rxnfc {
 		__u32			rule_cnt;
 		__u32			rss_context;
 	};
-	__u32				rule_locs[0];
+	__DECLARE_FLEX_ARRAY(__u32,	rule_locs);
 };
 
 
Signature · 1 line
2.34.1
maintainer
#1 lore raw
Quoted 3 lines · On Thu, 5 Jan 2023 13:41:34 -0800 Kees Cook wrote:

Zero-length arrays are deprecated[1]. Replace struct ethtool_rxnfc's "rule_locs" 0-length array with a flexible array. Detected with GCC 13, using -fstrict-flex-arrays=3:

You gotta CC netdev to get it into patchwork etc.

author
#2 lore raw
Quoted 6 lines · Jakub Kicinski
Quoted 3 lines · On Thu, 5 Jan 2023 13:41:34 -0800 Kees Cook wrote:

Zero-length arrays are deprecated[1]. Replace struct ethtool_rxnfc's "rule_locs" 0-length array with a flexible array. Detected with GCC 13, using -fstrict-flex-arrays=3:

You gotta CC netdev to get it into patchwork etc.

Oops, thanks. I'm not sure how that went missing. v2 sent.

Signature · 1 line
Kees Cook