* [PATCH] wifi: ipw2x00: Annotate struct libipw_txb with __counted_by
@ 2023-09-15 20:06 Kees Cook
2023-09-15 20:33 ` Gustavo A. R. Silva
2023-09-21 6:30 ` Kalle Valo
0 siblings, 2 replies; 3+ messages in thread
From: Kees Cook @ 2023-09-15 20:06 UTC (permalink / raw)
To: Stanislav Yakovlev
Cc: Kees Cook, Kalle Valo, linux-wireless, Nathan Chancellor,
Nick Desaulniers, Tom Rix, linux-kernel, llvm, linux-hardening
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 checking via CONFIG_UBSAN_BOUNDS
(for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family
functions).
As found with Coccinelle[1], add __counted_by for struct libipw_txb.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc: Stanislav Yakovlev <stas.yakovlev@gmail.com>
Cc: Kalle Valo <kvalo@kernel.org>
Cc: linux-wireless@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
drivers/net/wireless/intel/ipw2x00/libipw.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/intel/ipw2x00/libipw.h b/drivers/net/wireless/intel/ipw2x00/libipw.h
index bec7bc273748..9065ca5b0208 100644
--- a/drivers/net/wireless/intel/ipw2x00/libipw.h
+++ b/drivers/net/wireless/intel/ipw2x00/libipw.h
@@ -488,7 +488,7 @@ struct libipw_txb {
u8 reserved;
u16 frag_size;
u16 payload_size;
- struct sk_buff *fragments[];
+ struct sk_buff *fragments[] __counted_by(nr_frags);
};
/* SWEEP TABLE ENTRIES NUMBER */
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] wifi: ipw2x00: Annotate struct libipw_txb with __counted_by
2023-09-15 20:06 [PATCH] wifi: ipw2x00: Annotate struct libipw_txb with __counted_by Kees Cook
@ 2023-09-15 20:33 ` Gustavo A. R. Silva
2023-09-21 6:30 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Gustavo A. R. Silva @ 2023-09-15 20:33 UTC (permalink / raw)
To: Kees Cook, Stanislav Yakovlev
Cc: Kalle Valo, linux-wireless, Nathan Chancellor, Nick Desaulniers,
Tom Rix, linux-kernel, llvm, linux-hardening
On 9/15/23 14:06, Kees Cook 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 checking via CONFIG_UBSAN_BOUNDS
> (for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family
> functions).
>
> As found with Coccinelle[1], add __counted_by for struct libipw_txb.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Stanislav Yakovlev <stas.yakovlev@gmail.com>
> Cc: Kalle Valo <kvalo@kernel.org>
> Cc: linux-wireless@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks
--
Gustavo
> ---
> drivers/net/wireless/intel/ipw2x00/libipw.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/intel/ipw2x00/libipw.h b/drivers/net/wireless/intel/ipw2x00/libipw.h
> index bec7bc273748..9065ca5b0208 100644
> --- a/drivers/net/wireless/intel/ipw2x00/libipw.h
> +++ b/drivers/net/wireless/intel/ipw2x00/libipw.h
> @@ -488,7 +488,7 @@ struct libipw_txb {
> u8 reserved;
> u16 frag_size;
> u16 payload_size;
> - struct sk_buff *fragments[];
> + struct sk_buff *fragments[] __counted_by(nr_frags);
> };
>
> /* SWEEP TABLE ENTRIES NUMBER */
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] wifi: ipw2x00: Annotate struct libipw_txb with __counted_by
2023-09-15 20:06 [PATCH] wifi: ipw2x00: Annotate struct libipw_txb with __counted_by Kees Cook
2023-09-15 20:33 ` Gustavo A. R. Silva
@ 2023-09-21 6:30 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Kalle Valo @ 2023-09-21 6:30 UTC (permalink / raw)
To: Kees Cook
Cc: Stanislav Yakovlev, Kees Cook, linux-wireless, Nathan Chancellor,
Nick Desaulniers, Tom Rix, linux-kernel, llvm, linux-hardening
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 checking via CONFIG_UBSAN_BOUNDS
> (for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family
> functions).
>
> As found with Coccinelle[1], add __counted_by for struct libipw_txb.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Stanislav Yakovlev <stas.yakovlev@gmail.com>
> Cc: Kalle Valo <kvalo@kernel.org>
> Cc: linux-wireless@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
> Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Patch applied to wireless-next.git, thanks.
357be7ebba38 wifi: ipw2x00: Annotate struct libipw_txb with __counted_by
--
https://patchwork.kernel.org/project/linux-wireless/patch/20230915200602.never.582-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-09-21 6:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-15 20:06 [PATCH] wifi: ipw2x00: Annotate struct libipw_txb with __counted_by Kees Cook
2023-09-15 20:33 ` Gustavo A. R. Silva
2023-09-21 6:30 ` 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).