* Re: [PATCH] net/mlx5: Annotate struct mlx5_flow_handle with __counted_by
2023-10-03 23:17 [PATCH] net/mlx5: Annotate struct mlx5_flow_handle with __counted_by Kees Cook
@ 2023-10-03 23:26 ` Justin Stitt
2023-10-03 23:33 ` Gustavo A. R. Silva
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Justin Stitt @ 2023-10-03 23:26 UTC (permalink / raw)
To: Kees Cook
Cc: Saeed Mahameed, Leon Romanovsky, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, netdev, linux-rdma,
Gustavo A. R. Silva, Nathan Chancellor, Nick Desaulniers, Tom Rix,
linux-kernel, linux-hardening, llvm
On Tue, Oct 3, 2023 at 4:17 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).
>
> As found with Coccinelle[1], add __counted_by for struct mlx5_flow_handle.
>
> Cc: Saeed Mahameed <saeedm@nvidia.com>
> Cc: Leon Romanovsky <leon@kernel.org>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Eric Dumazet <edumazet@google.com>
> Cc: Jakub Kicinski <kuba@kernel.org>
> Cc: Paolo Abeni <pabeni@redhat.com>
> Cc: netdev@vger.kernel.org
> Cc: linux-rdma@vger.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>
> ---
> drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
> index 4aed1768b85f..78eb6b7097e1 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
> @@ -181,7 +181,7 @@ struct mlx5_flow_rule {
>
> struct mlx5_flow_handle {
> int num_rules;
> - struct mlx5_flow_rule *rule[];
> + struct mlx5_flow_rule *rule[] __counted_by(num_rules);
> };
Great patch!
handle->num_rules is properly assigned to before handle->rule
has any accesses.
handle = alloc_handle((dest_num) ? dest_num : 1);
then
static struct mlx5_flow_handle *alloc_handle(int num_rules) {
...
handle->num_rules = num_rules;
then
handle->rule[i] = rule;
Reviewed-by: Justin Stitt <justinstitt@google.com>
>
> /* Type of children is mlx5_flow_group */
> --
> 2.34.1
>
>
Thanks
Justin
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] net/mlx5: Annotate struct mlx5_flow_handle with __counted_by
2023-10-03 23:17 [PATCH] net/mlx5: Annotate struct mlx5_flow_handle with __counted_by Kees Cook
2023-10-03 23:26 ` Justin Stitt
@ 2023-10-03 23:33 ` Gustavo A. R. Silva
2023-10-04 18:45 ` Leon Romanovsky
2023-10-12 19:48 ` Saeed Mahameed
3 siblings, 0 replies; 5+ messages in thread
From: Gustavo A. R. Silva @ 2023-10-03 23:33 UTC (permalink / raw)
To: Kees Cook, Saeed Mahameed
Cc: Leon Romanovsky, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, netdev, linux-rdma, Gustavo A. R. Silva,
Nathan Chancellor, Nick Desaulniers, Tom Rix, linux-kernel,
linux-hardening, llvm
On 10/4/23 01:17, 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 mlx5_flow_handle.
>
> Cc: Saeed Mahameed <saeedm@nvidia.com>
> Cc: Leon Romanovsky <leon@kernel.org>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Eric Dumazet <edumazet@google.com>
> Cc: Jakub Kicinski <kuba@kernel.org>
> Cc: Paolo Abeni <pabeni@redhat.com>
> Cc: netdev@vger.kernel.org
> Cc: linux-rdma@vger.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
> ---
> drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
> index 4aed1768b85f..78eb6b7097e1 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
> @@ -181,7 +181,7 @@ struct mlx5_flow_rule {
>
> struct mlx5_flow_handle {
> int num_rules;
> - struct mlx5_flow_rule *rule[];
> + struct mlx5_flow_rule *rule[] __counted_by(num_rules);
> };
>
> /* Type of children is mlx5_flow_group */
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] net/mlx5: Annotate struct mlx5_flow_handle with __counted_by
2023-10-03 23:17 [PATCH] net/mlx5: Annotate struct mlx5_flow_handle with __counted_by Kees Cook
2023-10-03 23:26 ` Justin Stitt
2023-10-03 23:33 ` Gustavo A. R. Silva
@ 2023-10-04 18:45 ` Leon Romanovsky
2023-10-12 19:48 ` Saeed Mahameed
3 siblings, 0 replies; 5+ messages in thread
From: Leon Romanovsky @ 2023-10-04 18:45 UTC (permalink / raw)
To: Kees Cook
Cc: Saeed Mahameed, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, netdev, linux-rdma, Gustavo A. R. Silva,
Nathan Chancellor, Nick Desaulniers, Tom Rix, linux-kernel,
linux-hardening, llvm
On Tue, Oct 03, 2023 at 04:17:30PM -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 mlx5_flow_handle.
>
> Cc: Saeed Mahameed <saeedm@nvidia.com>
> Cc: Leon Romanovsky <leon@kernel.org>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Eric Dumazet <edumazet@google.com>
> Cc: Jakub Kicinski <kuba@kernel.org>
> Cc: Paolo Abeni <pabeni@redhat.com>
> Cc: netdev@vger.kernel.org
> Cc: linux-rdma@vger.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>
> ---
> drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
Thanks,
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] net/mlx5: Annotate struct mlx5_flow_handle with __counted_by
2023-10-03 23:17 [PATCH] net/mlx5: Annotate struct mlx5_flow_handle with __counted_by Kees Cook
` (2 preceding siblings ...)
2023-10-04 18:45 ` Leon Romanovsky
@ 2023-10-12 19:48 ` Saeed Mahameed
3 siblings, 0 replies; 5+ messages in thread
From: Saeed Mahameed @ 2023-10-12 19:48 UTC (permalink / raw)
To: Kees Cook
Cc: Saeed Mahameed, Leon Romanovsky, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, netdev, linux-rdma,
Gustavo A. R. Silva, Nathan Chancellor, Nick Desaulniers, Tom Rix,
linux-kernel, linux-hardening, llvm
On 03 Oct 16:17, 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 mlx5_flow_handle.
>
>Cc: Saeed Mahameed <saeedm@nvidia.com>
>Cc: Leon Romanovsky <leon@kernel.org>
>Cc: "David S. Miller" <davem@davemloft.net>
>Cc: Eric Dumazet <edumazet@google.com>
>Cc: Jakub Kicinski <kuba@kernel.org>
>Cc: Paolo Abeni <pabeni@redhat.com>
>Cc: netdev@vger.kernel.org
>Cc: linux-rdma@vger.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>
applied to net-next-mlx5.
^ permalink raw reply [flat|nested] 5+ messages in thread