* [PATCH] firewire: Annotate struct fw_node with __counted_by
@ 2023-09-22 17:53 Kees Cook
2023-09-23 16:37 ` Gustavo A. R. Silva
2023-09-24 12:54 ` Takashi Sakamoto
0 siblings, 2 replies; 3+ messages in thread
From: Kees Cook @ 2023-09-22 17:53 UTC (permalink / raw)
To: Takashi Sakamoto
Cc: Kees Cook, linux1394-devel, 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 fw_node.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Cc: linux1394-devel@lists.sourceforge.net
Signed-off-by: Kees Cook <keescook@chromium.org>
---
drivers/firewire/core.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
index 2a05f411328f..95c10f3d2282 100644
--- a/drivers/firewire/core.h
+++ b/drivers/firewire/core.h
@@ -191,7 +191,7 @@ struct fw_node {
/* Upper layer specific data. */
void *data;
- struct fw_node *ports[];
+ struct fw_node *ports[] __counted_by(port_count);
};
static inline struct fw_node *fw_node_get(struct fw_node *node)
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] firewire: Annotate struct fw_node with __counted_by
2023-09-22 17:53 [PATCH] firewire: Annotate struct fw_node with __counted_by Kees Cook
@ 2023-09-23 16:37 ` Gustavo A. R. Silva
2023-09-24 12:54 ` Takashi Sakamoto
1 sibling, 0 replies; 3+ messages in thread
From: Gustavo A. R. Silva @ 2023-09-23 16:37 UTC (permalink / raw)
To: Kees Cook, Takashi Sakamoto
Cc: linux1394-devel, Nathan Chancellor, Nick Desaulniers, Tom Rix,
linux-kernel, llvm, linux-hardening
On 9/22/23 11:53, 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 fw_node.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Takashi Sakamoto <o-takashi@sakamocchi.jp>
> Cc: linux1394-devel@lists.sourceforge.net
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks
--
Gustavo
> ---
> drivers/firewire/core.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
> index 2a05f411328f..95c10f3d2282 100644
> --- a/drivers/firewire/core.h
> +++ b/drivers/firewire/core.h
> @@ -191,7 +191,7 @@ struct fw_node {
> /* Upper layer specific data. */
> void *data;
>
> - struct fw_node *ports[];
> + struct fw_node *ports[] __counted_by(port_count);
> };
>
> static inline struct fw_node *fw_node_get(struct fw_node *node)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] firewire: Annotate struct fw_node with __counted_by
2023-09-22 17:53 [PATCH] firewire: Annotate struct fw_node with __counted_by Kees Cook
2023-09-23 16:37 ` Gustavo A. R. Silva
@ 2023-09-24 12:54 ` Takashi Sakamoto
1 sibling, 0 replies; 3+ messages in thread
From: Takashi Sakamoto @ 2023-09-24 12:54 UTC (permalink / raw)
To: Kees Cook
Cc: linux1394-devel, Nathan Chancellor, Nick Desaulniers, Tom Rix,
linux-kernel, llvm, linux-hardening
Hi,
On Fri, Sep 22, 2023 at 10:53:35AM -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 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 fw_node.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Takashi Sakamoto <o-takashi@sakamocchi.jp>
> Cc: linux1394-devel@lists.sourceforge.net
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
> drivers/firewire/core.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to for-next branch, thanks.
Regards
Takashi Sakamoto
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-09-24 12:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-22 17:53 [PATCH] firewire: Annotate struct fw_node with __counted_by Kees Cook
2023-09-23 16:37 ` Gustavo A. R. Silva
2023-09-24 12:54 ` Takashi Sakamoto
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox