From: Thorsten Blum <thorsten.blum@toblux.com>
Date: Wed, 21 Aug 2024 16:29:22 +0000 (+0200)
Subject: bcachefs: Annotate struct bucket_array with __counted_by()
X-Git-Tag: v6.12-rc1~101^2~85
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8573dd3474e8ec067b3c0c80d591c6de1d94e1e9;p=thirdparty%2Fkernel%2Flinux.git

bcachefs: Annotate struct bucket_array with __counted_by()

Add the __counted_by compiler attribute to the flexible array member
bucket to improve access bounds-checking via CONFIG_UBSAN_BOUNDS and
CONFIG_FORTIFY_SOURCE.

Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/buckets_types.h b/fs/bcachefs/buckets_types.h
index c9698cdf866f9..a19460a1bb7c8 100644
--- a/fs/bcachefs/buckets_types.h
+++ b/fs/bcachefs/buckets_types.h
@@ -24,7 +24,7 @@ struct bucket_array {
 	u16			first_bucket;
 	size_t			nbuckets;
 	size_t			nbuckets_minus_first;
-	struct bucket		b[];
+	struct bucket		b[] __counted_by(nbuckets);
 };
 
 struct bucket_gens {