* [PATCH] nvmet-fc: Annotate struct nvmet_fc_tgt_queue with __counted_by
@ 2023-10-03 23:25 Kees Cook
2023-10-03 23:41 ` Gustavo A. R. Silva
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Kees Cook @ 2023-10-03 23:25 UTC (permalink / raw)
To: James Smart
Cc: Kees Cook, Christoph Hellwig, Sagi Grimberg, Chaitanya Kulkarni,
linux-nvme, Gustavo A. R. Silva, Nathan Chancellor,
Nick Desaulniers, Tom Rix, linux-kernel, linux-hardening, llvm
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 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 nvmet_fc_tgt_queue.
Cc: James Smart <james.smart@broadcom.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Sagi Grimberg <sagi@grimberg.me>
Cc: Chaitanya Kulkarni <kch@nvidia.com>
Cc: linux-nvme@lists.infradead.org
Link: https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci [1]
Signed-off-by: Kees Cook <keescook@chromium.org>
---
drivers/nvme/target/fc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/nvme/target/fc.c b/drivers/nvme/target/fc.c
index 1ab6601fdd5c..0fa2d658cdeb 100644
--- a/drivers/nvme/target/fc.c
+++ b/drivers/nvme/target/fc.c
@@ -146,7 +146,7 @@ struct nvmet_fc_tgt_queue {
struct workqueue_struct *work_q;
struct kref ref;
struct rcu_head rcu;
- struct nvmet_fc_fcp_iod fod[]; /* array of fcp_iods */
+ struct nvmet_fc_fcp_iod fod[] __counted_by(sqsize); /* array of fcp_iods */
} __aligned(sizeof(unsigned long long));
struct nvmet_fc_hostport {
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] nvmet-fc: Annotate struct nvmet_fc_tgt_queue with __counted_by
2023-10-03 23:25 [PATCH] nvmet-fc: Annotate struct nvmet_fc_tgt_queue with __counted_by Kees Cook
@ 2023-10-03 23:41 ` Gustavo A. R. Silva
2023-10-04 6:33 ` Chaitanya Kulkarni
2023-10-05 8:22 ` Christoph Hellwig
2 siblings, 0 replies; 4+ messages in thread
From: Gustavo A. R. Silva @ 2023-10-03 23:41 UTC (permalink / raw)
To: Kees Cook, James Smart
Cc: Christoph Hellwig, Sagi Grimberg, Chaitanya Kulkarni, linux-nvme,
Gustavo A. R. Silva, Nathan Chancellor, Nick Desaulniers, Tom Rix,
linux-kernel, linux-hardening, llvm
On 10/4/23 01:25, 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 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 nvmet_fc_tgt_queue.
>
> Cc: James Smart <james.smart@broadcom.com>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: Sagi Grimberg <sagi@grimberg.me>
> Cc: Chaitanya Kulkarni <kch@nvidia.com>
> Cc: linux-nvme@lists.infradead.org
> Link: https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci [1]
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks
--
Gustavo
> ---
> drivers/nvme/target/fc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/nvme/target/fc.c b/drivers/nvme/target/fc.c
> index 1ab6601fdd5c..0fa2d658cdeb 100644
> --- a/drivers/nvme/target/fc.c
> +++ b/drivers/nvme/target/fc.c
> @@ -146,7 +146,7 @@ struct nvmet_fc_tgt_queue {
> struct workqueue_struct *work_q;
> struct kref ref;
> struct rcu_head rcu;
> - struct nvmet_fc_fcp_iod fod[]; /* array of fcp_iods */
> + struct nvmet_fc_fcp_iod fod[] __counted_by(sqsize); /* array of fcp_iods */
> } __aligned(sizeof(unsigned long long));
>
> struct nvmet_fc_hostport {
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] nvmet-fc: Annotate struct nvmet_fc_tgt_queue with __counted_by
2023-10-03 23:25 [PATCH] nvmet-fc: Annotate struct nvmet_fc_tgt_queue with __counted_by Kees Cook
2023-10-03 23:41 ` Gustavo A. R. Silva
@ 2023-10-04 6:33 ` Chaitanya Kulkarni
2023-10-05 8:22 ` Christoph Hellwig
2 siblings, 0 replies; 4+ messages in thread
From: Chaitanya Kulkarni @ 2023-10-04 6:33 UTC (permalink / raw)
To: Kees Cook, James Smart
Cc: Christoph Hellwig, Sagi Grimberg, Chaitanya Kulkarni,
linux-nvme@lists.infradead.org, Gustavo A. R. Silva,
Nathan Chancellor, Nick Desaulniers, Tom Rix,
linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org,
llvm@lists.linux.dev
On 10/3/23 16:25, 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 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 nvmet_fc_tgt_queue.
>
> Cc: James Smart <james.smart@broadcom.com>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: Sagi Grimberg <sagi@grimberg.me>
> Cc: Chaitanya Kulkarni <kch@nvidia.com>
> Cc: linux-nvme@lists.infradead.org
> Link: https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci [1]
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
>
Looks good.
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
-ck
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] nvmet-fc: Annotate struct nvmet_fc_tgt_queue with __counted_by
2023-10-03 23:25 [PATCH] nvmet-fc: Annotate struct nvmet_fc_tgt_queue with __counted_by Kees Cook
2023-10-03 23:41 ` Gustavo A. R. Silva
2023-10-04 6:33 ` Chaitanya Kulkarni
@ 2023-10-05 8:22 ` Christoph Hellwig
2 siblings, 0 replies; 4+ messages in thread
From: Christoph Hellwig @ 2023-10-05 8:22 UTC (permalink / raw)
To: Kees Cook
Cc: James Smart, Christoph Hellwig, Sagi Grimberg, Chaitanya Kulkarni,
linux-nvme, Gustavo A. R. Silva, Nathan Chancellor,
Nick Desaulniers, Tom Rix, linux-kernel, linux-hardening, llvm
On Tue, Oct 03, 2023 at 04:25:11PM -0700, Kees Cook wrote:
> struct workqueue_struct *work_q;
> struct kref ref;
> struct rcu_head rcu;
> - struct nvmet_fc_fcp_iod fod[]; /* array of fcp_iods */
> + struct nvmet_fc_fcp_iod fod[] __counted_by(sqsize); /* array of fcp_iods */
Please move the comment up to not spill over the end of the line.
Otherwise this looks good.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-10-05 8:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-03 23:25 [PATCH] nvmet-fc: Annotate struct nvmet_fc_tgt_queue with __counted_by Kees Cook
2023-10-03 23:41 ` Gustavo A. R. Silva
2023-10-04 6:33 ` Chaitanya Kulkarni
2023-10-05 8:22 ` Christoph Hellwig
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).