udf: Annotate struct udf_bitmap with __counted_by
PATCH 1/1 udf: Annotate struct udf_bitmap with __counted_by
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
--- fs/udf/udf_sb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/udf/udf_sb.h +1 -1
@@ -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 {
Signature · 1 line
2.34.1
Quoted 6 lines · Kees Cook
Prepare for the coming implementation by GCC and Clang of the
__counted_byattribute. Flexible array members annotated with__counted_bycan have their accesses bounds-checked at run-time checking viaCONFIG_UBSAN_BOUNDS(for array indexing) andCONFIG_FORTIFY_SOURCE(for strcpy/memcpy-family functions).
Quoted 6 lines
As found with Coccinelle[1], add
__counted_byfor structudf_bitmap.[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc Jan Kara <[email protected]>Signed-off-by Kees Cook <[email protected]>
Thanks
Signature · 1 line
Gustavo
Quoted 17 lines
--- fs/udf/udf_sb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/udf/udf_sb.h +1
-1@@ -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 {
Quoted 9 lines · Gustavo A. R. Silva
Quoted 6 lines · Kees Cook
Prepare for the coming implementation by GCC and Clang of the
__counted_byattribute. Flexible array members annotated with__counted_bycan have their accesses bounds-checked at run-time checking viaCONFIG_UBSAN_BOUNDS(for array indexing) andCONFIG_FORTIFY_SOURCE(for strcpy/memcpy-family functions).
Quoted 8 lines
Quoted 6 lines
As found with Coccinelle[1], add
__counted_byfor structudf_bitmap.[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc Jan Kara <[email protected]>Signed-off-by Kees Cook <[email protected]>Reviewed-by Gustavo A. R. Silva <[email protected]>
Thanks. I've queued the patch to my tree.
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR