* [PATCH] drbd: Annotate struct fifo_buffer with __counted_by
@ 2023-09-15 20:03 Kees Cook
2023-09-15 20:24 ` Gustavo A. R. Silva
2023-09-29 19:21 ` Kees Cook
0 siblings, 2 replies; 3+ messages in thread
From: Kees Cook @ 2023-09-15 20:03 UTC (permalink / raw)
To: Philipp Reisner
Cc: Kees Cook, Lars Ellenberg, Christoph Böhmwalder, Jens Axboe,
drbd-dev, linux-block, 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 fifo_buffer.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc: Philipp Reisner <philipp.reisner@linbit.com>
Cc: Lars Ellenberg <lars.ellenberg@linbit.com>
Cc: "Christoph Böhmwalder" <christoph.boehmwalder@linbit.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: drbd-dev@lists.linbit.com
Cc: linux-block@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
drivers/block/drbd/drbd_int.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index a30a5ed811be..7eecc53fae3d 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -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);
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] drbd: Annotate struct fifo_buffer with __counted_by
2023-09-15 20:03 [PATCH] drbd: Annotate struct fifo_buffer with __counted_by Kees Cook
@ 2023-09-15 20:24 ` Gustavo A. R. Silva
2023-09-29 19:21 ` Kees Cook
1 sibling, 0 replies; 3+ messages in thread
From: Gustavo A. R. Silva @ 2023-09-15 20:24 UTC (permalink / raw)
To: Kees Cook, Philipp Reisner
Cc: Lars Ellenberg, Christoph Böhmwalder, Jens Axboe, drbd-dev,
linux-block, Nathan Chancellor, Nick Desaulniers, Tom Rix,
linux-kernel, llvm, linux-hardening
On 9/15/23 14:03, 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 fifo_buffer.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Philipp Reisner <philipp.reisner@linbit.com>
> Cc: Lars Ellenberg <lars.ellenberg@linbit.com>
> Cc: "Christoph Böhmwalder" <christoph.boehmwalder@linbit.com>
> Cc: Jens Axboe <axboe@kernel.dk>
> Cc: drbd-dev@lists.linbit.com
> Cc: linux-block@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks
--
Gustavo
> ---
> drivers/block/drbd/drbd_int.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
> index a30a5ed811be..7eecc53fae3d 100644
> --- a/drivers/block/drbd/drbd_int.h
> +++ b/drivers/block/drbd/drbd_int.h
> @@ -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);
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] drbd: Annotate struct fifo_buffer with __counted_by
2023-09-15 20:03 [PATCH] drbd: Annotate struct fifo_buffer with __counted_by Kees Cook
2023-09-15 20:24 ` Gustavo A. R. Silva
@ 2023-09-29 19:21 ` Kees Cook
1 sibling, 0 replies; 3+ messages in thread
From: Kees Cook @ 2023-09-29 19:21 UTC (permalink / raw)
To: Philipp Reisner, Kees Cook
Cc: Lars Ellenberg, Christoph Böhmwalder, Jens Axboe, drbd-dev,
linux-block, Nathan Chancellor, Nick Desaulniers, Tom Rix,
linux-kernel, llvm, linux-hardening
On Fri, 15 Sep 2023 13:03:16 -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 fifo_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,
--
Kees Cook
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-09-29 19:21 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:03 [PATCH] drbd: Annotate struct fifo_buffer with __counted_by Kees Cook
2023-09-15 20:24 ` Gustavo A. R. Silva
2023-09-29 19:21 ` Kees Cook
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox