[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <ef147298-26a5-26e7-67c9-cd2f13ffb81b@linux.alibaba.com>
Date: Mon, 25 Sep 2023 10:22:31 +0800
From: Joseph Qi <joseph.qi@...ux.alibaba.com>
To: Kees Cook <keescook@...omium.org>, Mark Fasheh <mark@...heh.com>,
akpm <akpm@...ux-foundation.org>
Cc: Joel Becker <jlbec@...lplan.org>, Nathan Chancellor <nathan@...nel.org>,
Nick Desaulniers <ndesaulniers@...gle.com>, Tom Rix <trix@...hat.com>,
ocfs2-devel@...ts.linux.dev, llvm@...ts.linux.dev,
linux-kernel@...r.kernel.org, linux-hardening@...r.kernel.org
Subject: Re: [PATCH] ocfs2: Annotate struct ocfs2_replay_map with __counted_by
On 9/23/23 1:49 AM, 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 ocfs2_replay_map.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Mark Fasheh <mark@...heh.com>
> Cc: Joel Becker <jlbec@...lplan.org>
> Cc: Joseph Qi <joseph.qi@...ux.alibaba.com>
> Cc: Nathan Chancellor <nathan@...nel.org>
> Cc: Nick Desaulniers <ndesaulniers@...gle.com>
> Cc: Tom Rix <trix@...hat.com>
> Cc: ocfs2-devel@...ts.linux.dev
> Cc: llvm@...ts.linux.dev
> Signed-off-by: Kees Cook <keescook@...omium.org>
Reviewed-by: Joseph Qi <joseph.qi@...ux.alibaba.com>
> ---
> fs/ocfs2/journal.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
> index ce215565d061..604fea3a26ff 100644
> --- a/fs/ocfs2/journal.c
> +++ b/fs/ocfs2/journal.c
> @@ -90,7 +90,7 @@ enum ocfs2_replay_state {
> struct ocfs2_replay_map {
> unsigned int rm_slots;
> enum ocfs2_replay_state rm_state;
> - unsigned char rm_replay_slots[];
> + unsigned char rm_replay_slots[] __counted_by(rm_slots);
> };
>
> static void ocfs2_replay_map_set_state(struct ocfs2_super *osb, int state)
Powered by blists - more mailing lists