2023-10-09 16:11:16

by Kees Cook

Subject: [PATCH v2] wifi: p54: Annotate struct p54_cal_database 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).

Add __counted_by for struct p54_cal_database.

Cc: Christian Lamparter <[email protected]>
Cc: Kalle Valo <[email protected]>
Cc: "Gustavo A. R. Silva" <[email protected]>
Cc: [email protected]
Cc: [email protected]
Suggested-by: Jason Andryuk <[email protected]>
Signed-off-by: Kees Cook <[email protected]>
---
v1 - https://lore.kernel.org/all/[email protected]/
v2 - use the correct member (jandryuk)
---
drivers/net/wireless/intersil/p54/p54.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/intersil/p54/p54.h b/drivers/net/wireless/intersil/p54/p54.h
index 3356ea708d81..522656de4159 100644
--- a/drivers/net/wireless/intersil/p54/p54.h
+++ b/drivers/net/wireless/intersil/p54/p54.h
@@ -126,7 +126,7 @@ struct p54_cal_database {
size_t entry_size;
size_t offset;
size_t len;
- u8 data[];
+ u8 data[] __counted_by(len);
};

#define EEPROM_READBACK_LEN 0x3fc
--
2.34.1

2023-10-10 03:02:35

by Jason Andryuk

Subject: Re: [PATCH v2] wifi: p54: Annotate struct p54_cal_database with __counted_by

On Mon, Oct 9, 2023 at 12:10 PM Kees Cook <[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).
>
> Add __counted_by for struct p54_cal_database.
>
> Cc: Christian Lamparter <[email protected]>
> Cc: Kalle Valo <[email protected]>
> Cc: "Gustavo A. R. Silva" <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Suggested-by: Jason Andryuk <[email protected]>
> Signed-off-by: Kees Cook <[email protected]>

Reviewed-by: Jason Andryuk <[email protected]>

Thanks,
Jason

2023-10-12 12:13:12

by Kalle Valo

Subject: Re: [PATCH v2] wifi: p54: Annotate struct p54_cal_database with __counted_by

Kees Cook <[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).
>
> Add __counted_by for struct p54_cal_database.
>
> Cc: Christian Lamparter <[email protected]>
> Cc: Kalle Valo <[email protected]>
> Cc: "Gustavo A. R. Silva" <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Suggested-by: Jason Andryuk <[email protected]>
> Signed-off-by: Kees Cook <[email protected]>
> Reviewed-by: Jason Andryuk <[email protected]>

Patch applied to wireless-next.git, thanks.

d9756ce618f3 wifi: p54: Annotate struct p54_cal_database with __counted_by

--
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

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