drbd: Annotate struct fifo_buffer with __counted_by
Subsystems (2)
PATCH 1/1 drbd: Annotate struct fifo_buffer 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 fifo_buffer.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
--- drivers/block/drbd/drbd_int.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/drbd/drbd_int.h +1 -1
@@ -553,7 +553,7 @@ struct fifo_buffer {unsigned int head_index;unsigned int size;int total;/* sum of all values */ -int values[]; + int values[] __counted_by(size); };extern struct fifo_buffer *fifo_alloc (unsigned int fifo_size);
Signature · 1 line
2.34.1
Quoted 10 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).As found with Coccinelle[1], add
__counted_byfor structfifo_buffer.[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Quoted 7 lines
Cc Philipp Reisner <[email protected]>Cc Lars Ellenberg <[email protected]>Cc "Christoph Böhmwalder" <[email protected]>Cc Jens Axboe <[email protected]>Signed-off-by Kees Cook <[email protected]>
Thanks
Signature · 1 line
Gustavo
Quoted 17 lines
--- drivers/block/drbd/drbd_int.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/block/drbd/drbd_int.h +1
-1@@ -553,7 +553,7 @@ struct fifo_buffer {unsigned int head_index;unsigned int size;int total;/* sum of all values */ -int values[]; + int values[] __counted_by(size); };extern struct fifo_buffer *fifo_alloc (unsigned int fifo_size);
Kees Cook
AppliedQuoted 9 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).As found with Coccinelle[1], add
__counted_byfor structfifo_buffer.[...]
Applied to for-next/hardening, thanks!
[1/1] drbd: Annotate struct fifo_buffer with __counted_by
https://git.kernel.org/kees/c/f246956ca8f3
Take care,
Signature · 1 line
Kees Cook