Re: [PATCH] unwind deferred: Annotate struct unwind_cache with __counted_by
From: Steven Rostedt
Date: Fri Nov 14 2025 - 08:43:32 EST
On Fri, 14 Nov 2025 13:27:47 +0100
Thorsten Blum <thorsten.blum@xxxxxxxxx> wrote:
> Add the __counted_by() compiler attribute to the flexible array member
> 'entries' to improve access bounds-checking via CONFIG_UBSAN_BOUNDS and
> CONFIG_FORTIFY_SOURCE.
>
> Signed-off-by: Thorsten Blum <thorsten.blum@xxxxxxxxx>
> ---
> include/linux/unwind_deferred_types.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/linux/unwind_deferred_types.h b/include/linux/unwind_deferred_types.h
> index 33b62ac25c86..d4b67f0116f3 100644
> --- a/include/linux/unwind_deferred_types.h
> +++ b/include/linux/unwind_deferred_types.h
> @@ -5,7 +5,7 @@
> struct unwind_cache {
> unsigned long unwind_completed;
> unsigned int nr_entries;
> - unsigned long entries[];
> + unsigned long entries[] __counted_by(nr_entries);
> };
>
> /*
Wrong!
I need to add a comment here that entries is not bound by nr_entries.
https://lore.kernel.org/all/20250730093249.4833be14@xxxxxxxxxxxxxxxxxx/
Maybe this?:
diff --git a/include/linux/unwind_deferred_types.h b/include/linux/unwind_deferred_types.h
index 33b62ac25c86..d05409bb14fa 100644
--- a/include/linux/unwind_deferred_types.h
+++ b/include/linux/unwind_deferred_types.h
@@ -5,7 +5,7 @@
struct unwind_cache {
unsigned long unwind_completed;
unsigned int nr_entries;
- unsigned long entries[];
+ unsigned long entries[]; /* Fixed size, not bound by nr_entries */
};
/*
-- Steve