Skip to contentSkip to conversation

can: ucan: Replace zero-length array with DECLARE_FLEX_ARRAY() helper

PATCH Applied Gustavo A. R. Silva 3 participants 3 messages Sep 26, 2022 – Sep 27, 2022

Subsystems (3)
Networking Network drivers CAN network drivers
lore
Share & tools
lore

Gustavo A. R. Silva

author
#0 lore raw

PATCH 1/1 can: ucan: Replace zero-length array with DECLARE_FLEX_ARRAY() helper

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/214
Link https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html
Signed-off-by Gustavo A. R. Silva <[email protected]>
---
 drivers/net/can/usb/ucan.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/can/usb/ucan.c +2 -1
index 7c35f50fda4e..b53e709943bc 100644
@@ -245,7 +245,8 @@ struct ucan_message_in {
 		/* CAN transmission complete
 		 * (type == UCAN_IN_TX_COMPLETE)
 		 */
-		struct ucan_tx_complete_entry_t can_tx_complete_msg[0];
+		DECLARE_FLEX_ARRAY(struct ucan_tx_complete_entry_t,
+				   can_tx_complete_msg);
 	} __aligned(0x4) msg;
 } __packed __aligned(0x4);
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 11 lines · Gustavo A. R. Silva

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/214
Link https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html
Signed-off-by Gustavo A. R. Silva <[email protected]>
Reviewed-by Kees Cook <[email protected]>
Signature · 1 line
Kees Cook
maintainer Applied
#2 lore raw
In reply to Gustavo A. R. Silva
Quoted 11 lines · Gustavo A. R. Silva

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/214
Link https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html
Signed-off-by Gustavo A. R. Silva <[email protected]>

Applied to linux-can-next.

Thanks,
Marc

Signature · 4 lines
Pengutronix e.K.                 | Marc Kleine-Budde           |
Embedded Linux                   | https://www.pengutronix.de  |
Vertretung West/Dortmund         | Phone: +49-231-2826-924     |
Amtsgericht Hildesheim, HRA 2686 | Fax:   +49-5121-206917-5555 |