48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
|
From 85afbf893a6c7cd55e04407731e52d495b6f228f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Kees Cook <keescook@chromium.org>
|
||
|
|
Date: Fri, 15 Sep 2023 13:03:16 -0700
|
||
|
|
Subject: [PATCH 25/32] drbd: Annotate struct fifo_buffer with __counted_by
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
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
|
||
|
|
Reviewed-by: "Gustavo A. R. Silva" <gustavoars@kernel.org>
|
||
|
|
Link: https://lore.kernel.org/r/20230915200316.never.707-kees@kernel.org
|
||
|
|
Signed-off-by: Kees Cook <keescook@chromium.org>
|
||
|
|
---
|
||
|
|
drbd/drbd_int.h | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/drbd/drbd_int.h b/drbd/drbd_int.h
|
||
|
|
index c18407899f59..182593257c6a 100644
|
||
|
|
--- a/drbd/drbd_int.h
|
||
|
|
+++ b/drbd/drbd_int.h
|
||
|
|
@@ -746,7 +746,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.35.3
|
||
|
|
|