From: Simon Horman <horms@kernel•org>
To: Kees Cook <keescook@chromium•org>
Cc: Christophe JAILLET <christophe.jaillet@wanadoo•fr>,
dev@openvswitch•org, kernel-janitors@vger•kernel.org,
Tom Rix <trix@redhat•com>,
llvm@lists•linux.dev, Nick Desaulniers <ndesaulniers@google•com>,
"Gustavo A. R. Silva" <gustavoars@kernel•org>,
Nathan Chancellor <nathan@kernel•org>,
Eric Dumazet <edumazet@google•com>,
linux-hardening@vger•kernel.org, netdev@vger•kernel.org,
Jakub Kicinski <kuba@kernel•org>, Paolo Abeni <pabeni@redhat•com>,
"David S. Miller" <davem@davemloft•net>,
linux-kernel@vger•kernel.org
Subject: Re: [ovs-dev] [PATCH v2 2/2] net: openvswitch: Annotate struct mask_array with __counted_by
Date: Tue, 17 Oct 2023 11:10:02 +0200 [thread overview]
Message-ID: <20231017091002.GR1751252@kernel.org> (raw)
In-Reply-To: <202310141928.23985F1CA@keescook>
On Sat, Oct 14, 2023 at 07:29:57PM -0700, Kees Cook wrote:
> On Sat, Oct 14, 2023 at 08:34:53AM +0200, Christophe JAILLET 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).
> >
> > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo•fr>
> > ---
> > v2: Fix the subject [Ilya Maximets]
> > fix the field name used with __counted_by [Ilya Maximets]
> >
> > v1: https://lore.kernel.org/all/f66ddcf1ef9328f10292ea75a17b584359b6cde3.1696156198.git.christophe.jaillet@wanadoo.fr/
> >
> >
> > This patch is part of a work done in parallel of what is currently worked
> > on by Kees Cook.
> >
> > My patches are only related to corner cases that do NOT match the
> > semantic of his Coccinelle script[1].
> >
> > In this case, in tbl_mask_array_alloc(), several things are allocated with
> > a single allocation. Then, some pointer arithmetic computes the address of
> > the memory after the flex-array.
> >
> > [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
> > ---
> > net/openvswitch/flow_table.h | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/net/openvswitch/flow_table.h b/net/openvswitch/flow_table.h
> > index 9e659db78c05..f524dc3e4862 100644
> > --- a/net/openvswitch/flow_table.h
> > +++ b/net/openvswitch/flow_table.h
> > @@ -48,7 +48,7 @@ struct mask_array {
> > int count, max;
> > struct mask_array_stats __percpu *masks_usage_stats;
> > u64 *masks_usage_zero_cntr;
> > - struct sw_flow_mask __rcu *masks[];
> > + struct sw_flow_mask __rcu *masks[] __counted_by(max);
> > };
>
> Yup, this looks correct to me. Thanks!
>
> Reviewed-by: Kees Cook <keescook@chromium•org>
>
Likewise, I agree this is correct.
Reviewed-by: Simon Horman <horms@kernel•org>
next prev parent reply other threads:[~2023-10-17 9:10 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-14 6:34 [PATCH v2 1/2] net: openvswitch: Use struct_size() Christophe JAILLET
2023-10-14 6:34 ` [PATCH v2 2/2] net: openvswitch: Annotate struct mask_array with __counted_by Christophe JAILLET
2023-10-15 2:29 ` Kees Cook
2023-10-15 4:53 ` Julia Lawall
2023-10-15 7:20 ` Christophe JAILLET
2023-10-17 9:10 ` Simon Horman [this message]
2023-10-17 9:09 ` [ovs-dev] [PATCH v2 1/2] net: openvswitch: Use struct_size() Simon Horman
2023-10-17 13:50 ` patchwork-bot+netdevbpf
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=20231017091002.GR1751252@kernel.org \
--to=horms@kernel$(echo .)org \
--cc=christophe.jaillet@wanadoo$(echo .)fr \
--cc=davem@davemloft$(echo .)net \
--cc=dev@openvswitch$(echo .)org \
--cc=edumazet@google$(echo .)com \
--cc=gustavoars@kernel$(echo .)org \
--cc=keescook@chromium$(echo .)org \
--cc=kernel-janitors@vger$(echo .)kernel.org \
--cc=kuba@kernel$(echo .)org \
--cc=linux-hardening@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=llvm@lists$(echo .)linux.dev \
--cc=nathan@kernel$(echo .)org \
--cc=ndesaulniers@google$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=trix@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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