* [PATCH v2] wifi: p54: Annotate struct p54_cal_database with __counted_by
@ 2023-10-09 16:10 Kees Cook
2023-10-10 3:02 ` Jason Andryuk
2023-10-12 12:12 ` Kalle Valo
0 siblings, 2 replies; 3+ messages in thread
From: Kees Cook @ 2023-10-09 16:10 UTC (permalink / raw)
To: Christian Lamparter
Cc: Kees Cook, Kalle Valo, Gustavo A. R. Silva, linux-wireless,
linux-hardening, Jason Andryuk, Nathan Chancellor,
Nick Desaulniers, Tom Rix, linux-kernel, llvm
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 <chunkeey@googlemail.com>
Cc: Kalle Valo <kvalo@kernel.org>
Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Cc: linux-wireless@vger.kernel.org
Cc: linux-hardening@vger.kernel.org
Suggested-by: Jason Andryuk <jandryuk@gmail.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
---
v1 - https://lore.kernel.org/all/20231006201719.work.356-kees@kernel.org/
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] wifi: p54: Annotate struct p54_cal_database with __counted_by
2023-10-09 16:10 [PATCH v2] wifi: p54: Annotate struct p54_cal_database with __counted_by Kees Cook
@ 2023-10-10 3:02 ` Jason Andryuk
2023-10-12 12:12 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Jason Andryuk @ 2023-10-10 3:02 UTC (permalink / raw)
To: Kees Cook
Cc: Christian Lamparter, Kalle Valo, Gustavo A. R. Silva,
linux-wireless, linux-hardening, Nathan Chancellor,
Nick Desaulniers, Tom Rix, linux-kernel, llvm
On Mon, Oct 9, 2023 at 12:10 PM Kees Cook <keescook@chromium.org> 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 <chunkeey@googlemail.com>
> Cc: Kalle Valo <kvalo@kernel.org>
> Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org>
> Cc: linux-wireless@vger.kernel.org
> Cc: linux-hardening@vger.kernel.org
> Suggested-by: Jason Andryuk <jandryuk@gmail.com>
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Jason Andryuk <jandryuk@gmail.com>
Thanks,
Jason
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] wifi: p54: Annotate struct p54_cal_database with __counted_by
2023-10-09 16:10 [PATCH v2] wifi: p54: Annotate struct p54_cal_database with __counted_by Kees Cook
2023-10-10 3:02 ` Jason Andryuk
@ 2023-10-12 12:12 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Kalle Valo @ 2023-10-12 12:12 UTC (permalink / raw)
To: Kees Cook
Cc: Christian Lamparter, Kees Cook, Gustavo A. R. Silva,
linux-wireless, linux-hardening, Jason Andryuk, Nathan Chancellor,
Nick Desaulniers, Tom Rix, linux-kernel, llvm
Kees Cook <keescook@chromium.org> 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 <chunkeey@googlemail.com>
> Cc: Kalle Valo <kvalo@kernel.org>
> Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org>
> Cc: linux-wireless@vger.kernel.org
> Cc: linux-hardening@vger.kernel.org
> Suggested-by: Jason Andryuk <jandryuk@gmail.com>
> Signed-off-by: Kees Cook <keescook@chromium.org>
> Reviewed-by: Jason Andryuk <jandryuk@gmail.com>
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/20231009161028.it.544-kees@kernel.org/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-10-12 12:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-09 16:10 [PATCH v2] wifi: p54: Annotate struct p54_cal_database with __counted_by Kees Cook
2023-10-10 3:02 ` Jason Andryuk
2023-10-12 12:12 ` Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).