2024-03-27 02:24:45

by Gustavo A. R. Silva

[permalink] [raw]
Subject: [PATCH][next] 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).

Signed-off-by: Gustavo A. R. Silva <[email protected]>
---
drivers/net/wireless/ath/wil6210/wmi.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/wil6210/wmi.h b/drivers/net/wireless/ath/wil6210/wmi.h
index 71bf2ae27a98..6813f9e0bcf7 100644
--- a/drivers/net/wireless/ath/wil6210/wmi.h
+++ b/drivers/net/wireless/ath/wil6210/wmi.h
@@ -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 */
--
2.34.1



2024-03-28 12:57:37

by Kalle Valo

[permalink] [raw]
Subject: Re: [PATCH][next] wifi: wil6210: Annotate struct wmi_set_link_monitor_cmd with __counted_by()

"Gustavo A. R. Silva" <[email protected]> wrote:

> 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).
>
> Signed-off-by: Gustavo A. R. Silva <[email protected]>

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.

--
https://patchwork.kernel.org/project/linux-wireless/patch/ZgODZOB4fOBvKl7R@neat/

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


2024-03-28 19:20:21

by Gustavo A. R. Silva

[permalink] [raw]
Subject: Re: [PATCH][next] wifi: wil6210: Annotate struct wmi_set_link_monitor_cmd with __counted_by()



On 3/28/24 06:57, Kalle Valo wrote:
> "Gustavo A. R. Silva" <[email protected]> wrote:
>
>> 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).
>>
>> Signed-off-by: Gustavo A. R. Silva <[email protected]>
>
> 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