linux-hardening - Re: [PATCH] ocfs2: Annotate struct ocfs2_slot_info with __counted

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Sun, 17 Sep 2023 23:03:03 +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>, ocfs2-devel@...ts.linux.dev,
        Nathan Chancellor <nathan@...nel.org>,
        Nick Desaulniers <ndesaulniers@...gle.com>,
        Tom Rix <trix@...hat.com>, linux-kernel@...r.kernel.org,
        llvm@...ts.linux.dev, linux-hardening@...r.kernel.org
Subject: Re: [PATCH] ocfs2: Annotate struct ocfs2_slot_info with __counted_by



On 9/16/23 4:15 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_slot_info.
> 
> [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: ocfs2-devel@...ts.linux.dev
> Signed-off-by: Kees Cook <keescook@...omium.org>

Reviewed-by: Joseph Qi <joseph.qi@...ux.alibaba.com>
> ---
>  fs/ocfs2/slot_map.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fs/ocfs2/slot_map.c b/fs/ocfs2/slot_map.c
> index da7718cef735..e544c704b583 100644
> --- a/fs/ocfs2/slot_map.c
> +++ b/fs/ocfs2/slot_map.c
> @@ -37,7 +37,7 @@ struct ocfs2_slot_info {
>  	unsigned int si_blocks;
>  	struct buffer_head **si_bh;
>  	unsigned int si_num_slots;
> -	struct ocfs2_slot si_slots[];
> +	struct ocfs2_slot si_slots[] __counted_by(si_num_slots);
>  };
>  
>