Skip to contentSkip to conversation

wifi: wil6210: Annotate struct wmi_set_link_monitor_cmd with __counted_by()

PATCH In review Gustavo A. R. Silva 3 participants 3 messages Mar 27, 2024 – Mar 28, 2024 Wilocity WIL6210 wireless driver

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 wifi: wil6210: Annotate struct wmi_set_link_monitor_cmd with __counted_by()

Prepare for the coming implementation by GCC and Clang of the __counted_by attribute. Flexible array members annotated with __counted_by can have their accesses bounds-checked at run-time via CONFIG_UBSAN_BOUNDS (for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family functions).

---
 drivers/net/wireless/ath/wil6210/wmi.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/wil6210/wmi.h +1 -1
index 71bf2ae27a98..6813f9e0bcf7 100644
@@ -3320,7 +3320,7 @@ struct wmi_set_link_monitor_cmd {
 	u8 rssi_hyst;
 	u8 reserved[12];
 	u8 rssi_thresholds_list_size;
-	s8 rssi_thresholds_list[];
+	s8 rssi_thresholds_list[] __counted_by(rssi_thresholds_list_size);
 } __packed;
 
 /* wmi_link_monitor_event_type */
Signature · 1 line
2.34.1
#1 lore raw
Quoted 7 lines · Gustavo A. R. Silva

Prepare for the coming implementation by GCC and Clang of the __counted_by attribute. Flexible array members annotated with __counted_by can have their accesses bounds-checked at run-time via CONFIG_UBSAN_BOUNDS (for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family functions).

I'm dropping this because it looks like you sent a different patch, but it's quite hard to know for sure.

Patch set to Superseded.

Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/ZgODZOB4fOBvKl7R@neat/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
#2 lore raw
Quoted 8 lines · Kalle Valo
Quoted 6 lines · Gustavo A. R. Silva

Prepare for the coming implementation by GCC and Clang of the __counted_by attribute. Flexible array members annotated with __counted_by can have their accesses bounds-checked at run-time via CONFIG_UBSAN_BOUNDS (for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family functions).

Quoted 4 lines
Quoted 1 line

I'm dropping this because it looks like you sent a different patch, but it's quite hard to know for sure.

Ah yes, sorry, this was replaced by the following patch:

https://lore.kernel.org/linux-hardening/ZgSTCmdP+omePvWg@neat/

Thanks!
--
Gustavo