* [PATCH] nfp: Annotate struct nfp_reprs with __counted_by
@ 2023-10-03 23:18 Kees Cook
2023-10-03 23:39 ` Gustavo A. R. Silva
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Kees Cook @ 2023-10-03 23:18 UTC (permalink / raw)
To: Simon Horman
Cc: Kees Cook, Simon Horman, Jakub Kicinski, David S. Miller,
Eric Dumazet, Paolo Abeni, oss-drivers, netdev, Louis Peens,
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 nfp_reprs.
Cc: Simon Horman <simon.horman@corigine.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: oss-drivers@corigine.com
Cc: netdev@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/netronome/nfp/nfp_net_repr.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.h b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.h
index 48a74accbbd3..77bf4198dbde 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.h
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.h
@@ -18,7 +18,7 @@ struct nfp_port;
*/
struct nfp_reprs {
unsigned int num_reprs;
- struct net_device __rcu *reprs[];
+ struct net_device __rcu *reprs[] __counted_by(num_reprs);
};
/**
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] nfp: Annotate struct nfp_reprs with __counted_by
2023-10-03 23:18 [PATCH] nfp: Annotate struct nfp_reprs with __counted_by Kees Cook
@ 2023-10-03 23:39 ` Gustavo A. R. Silva
2023-10-04 5:13 ` Louis Peens
2023-10-06 1:40 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Gustavo A. R. Silva @ 2023-10-03 23:39 UTC (permalink / raw)
To: Kees Cook, Simon Horman
Cc: Simon Horman, Jakub Kicinski, David S. Miller, Eric Dumazet,
Paolo Abeni, oss-drivers, netdev, Louis Peens,
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 nfp_reprs.
>
> Cc: Simon Horman <simon.horman@corigine.com>
> Cc: Jakub Kicinski <kuba@kernel.org>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Eric Dumazet <edumazet@google.com>
> Cc: Paolo Abeni <pabeni@redhat.com>
> Cc: oss-drivers@corigine.com
> Cc: netdev@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/netronome/nfp/nfp_net_repr.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.h b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.h
> index 48a74accbbd3..77bf4198dbde 100644
> --- a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.h
> +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.h
> @@ -18,7 +18,7 @@ struct nfp_port;
> */
> struct nfp_reprs {
> unsigned int num_reprs;
> - struct net_device __rcu *reprs[];
> + struct net_device __rcu *reprs[] __counted_by(num_reprs);
> };
>
> /**
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] nfp: Annotate struct nfp_reprs with __counted_by
2023-10-03 23:18 [PATCH] nfp: Annotate struct nfp_reprs with __counted_by Kees Cook
2023-10-03 23:39 ` Gustavo A. R. Silva
@ 2023-10-04 5:13 ` Louis Peens
2023-10-06 1:40 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Louis Peens @ 2023-10-04 5:13 UTC (permalink / raw)
To: Kees Cook
Cc: Simon Horman, Simon Horman, Jakub Kicinski, David S. Miller,
Eric Dumazet, Paolo Abeni, oss-drivers, netdev,
Gustavo A. R. Silva, Nathan Chancellor, Nick Desaulniers, Tom Rix,
linux-kernel, linux-hardening, llvm
On Tue, Oct 03, 2023 at 04:18:43PM -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 nfp_reprs.
>
> Cc: Simon Horman <simon.horman@corigine.com>
> Cc: Jakub Kicinski <kuba@kernel.org>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Eric Dumazet <edumazet@google.com>
> Cc: Paolo Abeni <pabeni@redhat.com>
> Cc: oss-drivers@corigine.com
> Cc: netdev@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>
Thanks Kees
Acked-by: Louis Peens <louis.peens@corigine.com>
> ---
> drivers/net/ethernet/netronome/nfp/nfp_net_repr.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.h b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.h
> index 48a74accbbd3..77bf4198dbde 100644
> --- a/drivers/net/ethernet/netronome/nfp/nfp_net_repr.h
> +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_repr.h
> @@ -18,7 +18,7 @@ struct nfp_port;
> */
> struct nfp_reprs {
> unsigned int num_reprs;
> - struct net_device __rcu *reprs[];
> + struct net_device __rcu *reprs[] __counted_by(num_reprs);
> };
>
> /**
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] nfp: Annotate struct nfp_reprs with __counted_by
2023-10-03 23:18 [PATCH] nfp: Annotate struct nfp_reprs with __counted_by Kees Cook
2023-10-03 23:39 ` Gustavo A. R. Silva
2023-10-04 5:13 ` Louis Peens
@ 2023-10-06 1:40 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-10-06 1:40 UTC (permalink / raw)
To: Kees Cook
Cc: horms, simon.horman, kuba, davem, edumazet, pabeni, oss-drivers,
netdev, louis.peens, gustavoars, nathan, ndesaulniers, trix,
linux-kernel, linux-hardening, llvm
Hello:
This patch was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:
On Tue, 3 Oct 2023 16:18:43 -0700 you 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 nfp_reprs.
>
> [...]
Here is the summary with links:
- nfp: Annotate struct nfp_reprs with __counted_by
https://git.kernel.org/netdev/net-next/c/4514aa9f56fd
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-10-06 1:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-03 23:18 [PATCH] nfp: Annotate struct nfp_reprs with __counted_by Kees Cook
2023-10-03 23:39 ` Gustavo A. R. Silva
2023-10-04 5:13 ` Louis Peens
2023-10-06 1:40 ` patchwork-bot+netdevbpf
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).