Skip to contentSkip to conversation

ath6kl: Replace zero-length arrays with DECLARE_FLEX_ARRAY() helper

PATCH In review Atul Raut 3 participants 3 messages Jul 31, 2023 – Aug 1, 2023 Atheros ATH6KL wireless driver

lore
Share & tools
lore

Atul Raut

author
#0 lore raw

PATCH 1/1 ath6kl: Replace zero-length arrays with DECLARE_FLEX_ARRAY() helper

Because zero-length arrays are obsolete, replacing them with C99 flexible-array members.
Instead of defining a zero-length array, use the new DECLARE_FLEX_ARRAY() auxiliary macro.

This fixes warnings such as:
./drivers/net/wireless/ath/ath6kl/usb.c:109:8-12: WARNING use flexible-array member instead (https://www.kernel.org/doc/html/latest/process/deprecated.html#zero-length-and-one-element-arrays)

---
 drivers/net/wireless/ath/ath6kl/usb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath6kl/usb.c +1 -1
index 5220809841a6..bb3771a3897c 100644
@@ -106,7 +106,7 @@ struct ath6kl_usb_ctrl_diag_cmd_write {
 	__le32 cmd;
 	__le32 address;
 	__le32 value;
-	__le32 _pad[1];
+	DECLARE_FLEX_ARRAY(__le32, _pad);
 } __packed;
 
 struct ath6kl_usb_ctrl_diag_cmd_read {
Signature · 1 line
2.34.1
#1 lore raw
Quoted 18 lines · Atul Raut

Because zero-length arrays are obsolete, replacing them with C99 flexible-array members.
Instead of defining a zero-length array, use the new DECLARE_FLEX_ARRAY() auxiliary macro.

This fixes warnings such as:
./drivers/net/wireless/ath/ath6kl/usb.c:109:8-12: WARNING use flexible-array member instead (https://www.kernel.org/doc/html/latest/process/deprecated.html#zero-length-and-one-element-arrays)

---
 drivers/net/wireless/ath/ath6kl/usb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath6kl/usb.c +0 -0
index 5220809841a6..bb3771a3897c 100644

drivers/net/wireless/ath/ath6kl/usb.c struct ath6kl_usb_ctrl_diag_cmd_write { · line 109

Quoted 5 lines
drivers/net/wireless/ath/ath6kl/usb.c +1 -1
@@ -106,7 +106,7 @@ struct ath6kl_usb_ctrl_diag_cmd_write {
 	__le32 cmd;
 	__le32 address;
 	__le32 value;
-	__le32 _pad[1];
+	DECLARE_FLEX_ARRAY(__le32, _pad);

This is not a 0 length array, or a variable array. Look at the work done on the hardening mailing list for more details, I think this is wrong.

good luck!

greg k-h

#2 lore raw
Quoted 15 lines · Greg KH
Quoted 13 lines · Atul Raut

Because zero-length arrays are obsolete, replacing them with C99 flexible-array members.
Instead of defining a zero-length array, use the new DECLARE_FLEX_ARRAY() auxiliary macro.

This fixes warnings such as:
./drivers/net/wireless/ath/ath6kl/usb.c:109:8-12: WARNING use flexible-array member instead (https://www.kernel.org/doc/html/latest/process/deprecated.html#zero-length-and-one-element-arrays)

---
 drivers/net/wireless/ath/ath6kl/usb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 14 lines

drivers/net/wireless/ath/ath6kl/usb.c struct ath6kl_usb_ctrl_diag_cmd_write { · line 109

Quoted 10 lines
drivers/net/wireless/ath/ath6kl/usb.c +1 -1
index 5220809841a6..bb3771a3897c 100644
@@ -106,7 +106,7 @@ struct ath6kl_usb_ctrl_diag_cmd_write {
 	__le32 cmd;
 	__le32 address;
 	__le32 value;
-	__le32 _pad[1];
+	DECLARE_FLEX_ARRAY(__le32, _pad);

This is not a 0 length array, or a variable array. Look at the work done on the hardening mailing list for more details, I think this is wrong.

I agree with Greg, this is just padding and _pad is not even used anywhere in ath6kl. Though use of [1] is strange here, '__le32 _pad;' would be enough.

Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches