* [PATCH] i40e: Annotate struct i40e_qvlist_info with __counted_by
@ 2023-10-03 23:18 Kees Cook
2023-10-03 23:39 ` Gustavo A. R. Silva
2023-11-30 21:59 ` Kees Cook
0 siblings, 2 replies; 3+ messages in thread
From: Kees Cook @ 2023-10-03 23:18 UTC (permalink / raw)
To: Tony Nguyen
Cc: Kees Cook, Shiraz Saleem, Jakub Kicinski, Jesse Brandeburg,
Gurucharan G, Gustavo A. R. Silva, Nathan Chancellor,
Nick Desaulniers, Tom Rix, linux-kernel, linux-hardening, 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).
As found with Coccinelle[1], add __counted_by for struct i40e_qvlist_info.
Cc: Tony Nguyen <anthony.l.nguyen@intel.com>
Cc: Shiraz Saleem <shiraz.saleem@intel.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Gurucharan G <gurucharanx.g@intel.com>
Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Link: https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci [1]
Signed-off-by: Kees Cook <keescook@chromium.org>
---
include/linux/net/intel/i40e_client.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/net/intel/i40e_client.h b/include/linux/net/intel/i40e_client.h
index ed42bd5f639f..0aa4411528fc 100644
--- a/include/linux/net/intel/i40e_client.h
+++ b/include/linux/net/intel/i40e_client.h
@@ -45,7 +45,7 @@ struct i40e_qv_info {
struct i40e_qvlist_info {
u32 num_vectors;
- struct i40e_qv_info qv_info[];
+ struct i40e_qv_info qv_info[] __counted_by(num_vectors);
};
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] i40e: Annotate struct i40e_qvlist_info with __counted_by
2023-10-03 23:18 [PATCH] i40e: Annotate struct i40e_qvlist_info with __counted_by Kees Cook
@ 2023-10-03 23:39 ` Gustavo A. R. Silva
2023-11-30 21:59 ` Kees Cook
1 sibling, 0 replies; 3+ messages in thread
From: Gustavo A. R. Silva @ 2023-10-03 23:39 UTC (permalink / raw)
To: Kees Cook, Tony Nguyen
Cc: Shiraz Saleem, Jakub Kicinski, Jesse Brandeburg, Gurucharan G,
Gustavo A. R. Silva, Nathan Chancellor, Nick Desaulniers, Tom Rix,
linux-kernel, linux-hardening, llvm
On 10/4/23 01:18, 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 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 i40e_qvlist_info.
>
> Cc: Tony Nguyen <anthony.l.nguyen@intel.com>
> Cc: Shiraz Saleem <shiraz.saleem@intel.com>
> Cc: Jakub Kicinski <kuba@kernel.org>
> Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
> Cc: Gurucharan G <gurucharanx.g@intel.com>
> Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org>
> Link: https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci [1]
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks
--
Gustavo
> ---
> include/linux/net/intel/i40e_client.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/linux/net/intel/i40e_client.h b/include/linux/net/intel/i40e_client.h
> index ed42bd5f639f..0aa4411528fc 100644
> --- a/include/linux/net/intel/i40e_client.h
> +++ b/include/linux/net/intel/i40e_client.h
> @@ -45,7 +45,7 @@ struct i40e_qv_info {
>
> struct i40e_qvlist_info {
> u32 num_vectors;
> - struct i40e_qv_info qv_info[];
> + struct i40e_qv_info qv_info[] __counted_by(num_vectors);
> };
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] i40e: Annotate struct i40e_qvlist_info with __counted_by
2023-10-03 23:18 [PATCH] i40e: Annotate struct i40e_qvlist_info with __counted_by Kees Cook
2023-10-03 23:39 ` Gustavo A. R. Silva
@ 2023-11-30 21:59 ` Kees Cook
1 sibling, 0 replies; 3+ messages in thread
From: Kees Cook @ 2023-11-30 21:59 UTC (permalink / raw)
To: Tony Nguyen, Kees Cook
Cc: Shiraz Saleem, Jakub Kicinski, Jesse Brandeburg, Gurucharan G,
Gustavo A. R. Silva, Nathan Chancellor, Nick Desaulniers, Tom Rix,
linux-kernel, linux-hardening, llvm
On Tue, 03 Oct 2023 16:18:38 -0700, 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 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 i40e_qvlist_info.
>
> [...]
Applied to for-next/hardening, thanks!
[1/1] i40e: Annotate struct i40e_qvlist_info with __counted_by
https://git.kernel.org/kees/c/da2e08d4630a
Take care,
--
Kees Cook
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-11-30 21:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-03 23:18 [PATCH] i40e: Annotate struct i40e_qvlist_info with __counted_by Kees Cook
2023-10-03 23:39 ` Gustavo A. R. Silva
2023-11-30 21:59 ` Kees Cook
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox