* [PATCH] bcachefs: Annotate struct bucket_array with __counted_by()
@ 2024-08-21 16:29 Thorsten Blum
2024-08-22 17:35 ` Kees Cook
0 siblings, 1 reply; 2+ messages in thread
From: Thorsten Blum @ 2024-08-21 16:29 UTC (permalink / raw)
To: kent.overstreet, kees, gustavoars
Cc: linux-bcachefs, linux-kernel, linux-hardening, Thorsten Blum
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>
---
fs/bcachefs/buckets_types.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/bcachefs/buckets_types.h b/fs/bcachefs/buckets_types.h
index c9698cdf866f..a19460a1bb7c 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 {
--
2.46.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] bcachefs: Annotate struct bucket_array with __counted_by()
2024-08-21 16:29 [PATCH] bcachefs: Annotate struct bucket_array with __counted_by() Thorsten Blum
@ 2024-08-22 17:35 ` Kees Cook
0 siblings, 0 replies; 2+ messages in thread
From: Kees Cook @ 2024-08-22 17:35 UTC (permalink / raw)
To: Thorsten Blum
Cc: kent.overstreet, gustavoars, linux-bcachefs, linux-kernel,
linux-hardening
On Wed, Aug 21, 2024 at 06:29:22PM +0200, Thorsten Blum wrote:
> 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>
> ---
> fs/bcachefs/buckets_types.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/bcachefs/buckets_types.h b/fs/bcachefs/buckets_types.h
> index c9698cdf866f..a19460a1bb7c 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 {
I only see this being allocated in one place and nbuckets is immediately
assigned to the count of "b" elements, so this looks correct to me.
Reviewed-by: Kees Cook <kees@kernel.org>
--
Kees Cook
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-08-22 17:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-21 16:29 [PATCH] bcachefs: Annotate struct bucket_array with __counted_by() Thorsten Blum
2024-08-22 17:35 ` Kees Cook
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox