From: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
To: Kees Cook <keescook@chromium.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: John Keeping <john@keeping.me.uk>,
Udipto Goswami <quic_ugoswami@quicinc.com>,
Linyu Yuan <quic_linyyuan@quicinc.com>,
linux-usb@vger.kernel.org, Nathan Chancellor <nathan@kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>,
Tom Rix <trix@redhat.com>,
Krishna Kurapati <quic_kriskura@quicinc.com>,
Jeff Layton <jlayton@kernel.org>,
Uttkarsh Aggarwal <quic_uaggarwa@quicinc.com>,
Yuta Hayama <hayama@lineo.co.jp>,
linux-kernel@vger.kernel.org, llvm@lists.linux.dev,
linux-hardening@vger.kernel.org
Subject: Re: [PATCH] usb: gadget: f_fs: Annotate struct ffs_buffer with __counted_by
Date: Fri, 15 Sep 2023 14:21:58 -0600 [thread overview]
Message-ID: <0b48fe61-7d05-1520-d77e-81ad39bc80b4@embeddedor.com> (raw)
In-Reply-To: <20230915195849.never.275-kees@kernel.org>
On 9/15/23 13:58, 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 ffs_buffer.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: John Keeping <john@keeping.me.uk>
> Cc: Udipto Goswami <quic_ugoswami@quicinc.com>
> Cc: Linyu Yuan <quic_linyyuan@quicinc.com>
> Cc: linux-usb@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks
--
Gustavo
> ---
> drivers/usb/gadget/function/f_fs.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
> index 6e9ef35a43a7..af400d083777 100644
> --- a/drivers/usb/gadget/function/f_fs.c
> +++ b/drivers/usb/gadget/function/f_fs.c
> @@ -202,7 +202,7 @@ struct ffs_epfile {
> struct ffs_buffer {
> size_t length;
> char *data;
> - char storage[];
> + char storage[] __counted_by(length);
> };
>
> /* ffs_io_data structure ***************************************************/
next prev parent reply other threads:[~2023-09-15 20:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-15 19:58 [PATCH] usb: gadget: f_fs: Annotate struct ffs_buffer with __counted_by Kees Cook
2023-09-15 20:21 ` Gustavo A. R. Silva [this message]
2023-09-29 19:21 ` Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0b48fe61-7d05-1520-d77e-81ad39bc80b4@embeddedor.com \
--to=gustavo@embeddedor.com \
--cc=gregkh@linuxfoundation.org \
--cc=hayama@lineo.co.jp \
--cc=jlayton@kernel.org \
--cc=john@keeping.me.uk \
--cc=keescook@chromium.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=quic_kriskura@quicinc.com \
--cc=quic_linyyuan@quicinc.com \
--cc=quic_uaggarwa@quicinc.com \
--cc=quic_ugoswami@quicinc.com \
--cc=trix@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox