linux-hardening - Re: [PATCH] memstick: jmb38x_ms: Annotate struct jmb38x_ms 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] [day] [month] [year] [list]

Date: Tue, 26 Sep 2023 17:03:47 +0200
From: Ulf Hansson <ulf.hansson@...aro.org>
To: Kees Cook <keescook@...omium.org>
Cc: Maxim Levitsky <maximlevitsky@...il.com>, Alex Dubov <oakad@...oo.com>, Tom Rix <trix@...hat.com>, 
	Len Baker <len.baker@....com>, Dan Carpenter <error27@...il.com>, 
	"Gustavo A. R. Silva" <gustavoars@...nel.org>, linux-mmc@...r.kernel.org, 
	Nathan Chancellor <nathan@...nel.org>, Nick Desaulniers <ndesaulniers@...gle.com>, 
	linux-kernel@...r.kernel.org, llvm@...ts.linux.dev, 
	linux-hardening@...r.kernel.org
Subject: Re: [PATCH] memstick: jmb38x_ms: Annotate struct jmb38x_ms with __counted_by

On Fri, 22 Sept 2023 at 19:52, Kees Cook <keescook@...omium.org> 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 jmb38x_ms.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Maxim Levitsky <maximlevitsky@...il.com>
> Cc: Alex Dubov <oakad@...oo.com>
> Cc: Ulf Hansson <ulf.hansson@...aro.org>
> Cc: Tom Rix <trix@...hat.com>
> Cc: Len Baker <len.baker@....com>
> Cc: Dan Carpenter <error27@...il.com>
> Cc: "Gustavo A. R. Silva" <gustavoars@...nel.org>
> Cc: linux-mmc@...r.kernel.org
> Signed-off-by: Kees Cook <keescook@...omium.org>

Applied for next, thanks!

Kind regards
Uffe


> ---
>  drivers/memstick/host/jmb38x_ms.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/memstick/host/jmb38x_ms.c b/drivers/memstick/host/jmb38x_ms.c
> index 21cb2a786058..e77eb8b0eb12 100644
> --- a/drivers/memstick/host/jmb38x_ms.c
> +++ b/drivers/memstick/host/jmb38x_ms.c
> @@ -66,7 +66,7 @@ struct jmb38x_ms_host {
>  struct jmb38x_ms {
>         struct pci_dev        *pdev;
>         int                   host_cnt;
> -       struct memstick_host  *hosts[];
> +       struct memstick_host  *hosts[] __counted_by(host_cnt);
>  };
>
>  #define BLOCK_COUNT_MASK       0xffff0000
> --
> 2.34.1
>