* [PATCH] udf: Annotate struct udf_bitmap with __counted_by
@ 2023-09-15 20:14 Kees Cook
2023-09-15 20:50 ` Gustavo A. R. Silva
0 siblings, 1 reply; 3+ messages in thread
From: Kees Cook @ 2023-09-15 20:14 UTC (permalink / raw)
To: Jan Kara
Cc: Kees Cook, 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 udf_bitmap.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc: Jan Kara <jack@suse.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
---
fs/udf/udf_sb.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/udf/udf_sb.h b/fs/udf/udf_sb.h
index 9af6ff7f9747..f9a60bc1abcf 100644
--- a/fs/udf/udf_sb.h
+++ b/fs/udf/udf_sb.h
@@ -86,7 +86,7 @@ struct udf_virtual_data {
struct udf_bitmap {
__u32 s_extPosition;
int s_nr_groups;
- struct buffer_head *s_block_bitmap[];
+ struct buffer_head *s_block_bitmap[] __counted_by(s_nr_groups);
};
struct udf_part_map {
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] udf: Annotate struct udf_bitmap with __counted_by
2023-09-15 20:14 [PATCH] udf: Annotate struct udf_bitmap with __counted_by Kees Cook
@ 2023-09-15 20:50 ` Gustavo A. R. Silva
2023-09-18 7:10 ` Jan Kara
0 siblings, 1 reply; 3+ messages in thread
From: Gustavo A. R. Silva @ 2023-09-15 20:50 UTC (permalink / raw)
To: Kees Cook, Jan Kara
Cc: Nathan Chancellor, Nick Desaulniers, Tom Rix, linux-kernel, llvm,
linux-hardening
On 9/15/23 14:14, 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 udf_bitmap.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Jan Kara <jack@suse.com>
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks
--
Gustavo
> ---
> fs/udf/udf_sb.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/udf/udf_sb.h b/fs/udf/udf_sb.h
> index 9af6ff7f9747..f9a60bc1abcf 100644
> --- a/fs/udf/udf_sb.h
> +++ b/fs/udf/udf_sb.h
> @@ -86,7 +86,7 @@ struct udf_virtual_data {
> struct udf_bitmap {
> __u32 s_extPosition;
> int s_nr_groups;
> - struct buffer_head *s_block_bitmap[];
> + struct buffer_head *s_block_bitmap[] __counted_by(s_nr_groups);
> };
>
> struct udf_part_map {
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] udf: Annotate struct udf_bitmap with __counted_by
2023-09-15 20:50 ` Gustavo A. R. Silva
@ 2023-09-18 7:10 ` Jan Kara
0 siblings, 0 replies; 3+ messages in thread
From: Jan Kara @ 2023-09-18 7:10 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Kees Cook, Jan Kara, Nathan Chancellor, Nick Desaulniers, Tom Rix,
linux-kernel, llvm, linux-hardening
On Fri 15-09-23 14:50:14, Gustavo A. R. Silva wrote:
>
>
> On 9/15/23 14:14, 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 udf_bitmap.
> >
> > [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
> >
> > Cc: Jan Kara <jack@suse.com>
> > Signed-off-by: Kees Cook <keescook@chromium.org>
>
> Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks. I've queued the patch to my tree.
Honza
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-09-18 7:11 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:14 [PATCH] udf: Annotate struct udf_bitmap with __counted_by Kees Cook
2023-09-15 20:50 ` Gustavo A. R. Silva
2023-09-18 7:10 ` Jan Kara
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox