* [PATCH] io_uring/rsrc: Annotate struct io_mapped_ubuf with __counted_by
@ 2023-08-17 21:21 Kees Cook
2023-08-17 21:26 ` Gustavo A. R. Silva
2023-08-18 1:15 ` Jens Axboe
0 siblings, 2 replies; 3+ messages in thread
From: Kees Cook @ 2023-08-17 21:21 UTC (permalink / raw)
To: Jens Axboe
Cc: Kees Cook, Pavel Begunkov, io-uring, Nathan Chancellor,
Nick Desaulniers, Tom Rix, linux-kernel, llvm, linux-hardening
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 io_mapped_ubuf.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc: Jens Axboe <[email protected]>
Cc: Pavel Begunkov <[email protected]>
Cc: [email protected]
Signed-off-by: Kees Cook <[email protected]>
---
io_uring/rsrc.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/io_uring/rsrc.h b/io_uring/rsrc.h
index 8afa9ec66a55..8625181fb87a 100644
--- a/io_uring/rsrc.h
+++ b/io_uring/rsrc.h
@@ -54,7 +54,7 @@ struct io_mapped_ubuf {
u64 ubuf_end;
unsigned int nr_bvecs;
unsigned long acct_pages;
- struct bio_vec bvec[];
+ struct bio_vec bvec[] __counted_by(nr_bvecs);
};
void io_rsrc_node_ref_zero(struct io_rsrc_node *node);
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] io_uring/rsrc: Annotate struct io_mapped_ubuf with __counted_by
2023-08-17 21:21 [PATCH] io_uring/rsrc: Annotate struct io_mapped_ubuf with __counted_by Kees Cook
@ 2023-08-17 21:26 ` Gustavo A. R. Silva
2023-08-18 1:15 ` Jens Axboe
1 sibling, 0 replies; 3+ messages in thread
From: Gustavo A. R. Silva @ 2023-08-17 21:26 UTC (permalink / raw)
To: Kees Cook, Jens Axboe
Cc: Pavel Begunkov, io-uring, Nathan Chancellor, Nick Desaulniers,
Tom Rix, linux-kernel, llvm, linux-hardening
On 8/17/23 15:21, 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 io_mapped_ubuf.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Jens Axboe <[email protected]>
> Cc: Pavel Begunkov <[email protected]>
> Cc: [email protected]
> Signed-off-by: Kees Cook <[email protected]>
Reviewed-by: Gustavo A. R. Silva <[email protected]>
Thanks
--
Gustavo
> ---
> io_uring/rsrc.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/io_uring/rsrc.h b/io_uring/rsrc.h
> index 8afa9ec66a55..8625181fb87a 100644
> --- a/io_uring/rsrc.h
> +++ b/io_uring/rsrc.h
> @@ -54,7 +54,7 @@ struct io_mapped_ubuf {
> u64 ubuf_end;
> unsigned int nr_bvecs;
> unsigned long acct_pages;
> - struct bio_vec bvec[];
> + struct bio_vec bvec[] __counted_by(nr_bvecs);
> };
>
> void io_rsrc_node_ref_zero(struct io_rsrc_node *node);
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] io_uring/rsrc: Annotate struct io_mapped_ubuf with __counted_by
2023-08-17 21:21 [PATCH] io_uring/rsrc: Annotate struct io_mapped_ubuf with __counted_by Kees Cook
2023-08-17 21:26 ` Gustavo A. R. Silva
@ 2023-08-18 1:15 ` Jens Axboe
1 sibling, 0 replies; 3+ messages in thread
From: Jens Axboe @ 2023-08-18 1:15 UTC (permalink / raw)
To: Kees Cook
Cc: Pavel Begunkov, io-uring, Nathan Chancellor, Nick Desaulniers,
Tom Rix, linux-kernel, llvm, linux-hardening
On Thu, 17 Aug 2023 14:21:47 -0700, 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 io_mapped_ubuf.
>
> [...]
Applied, thanks!
[1/1] io_uring/rsrc: Annotate struct io_mapped_ubuf with __counted_by
commit: 04d9244c9420db33149608a566399176d57690f8
Best regards,
--
Jens Axboe
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-08-18 1:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-17 21:21 [PATCH] io_uring/rsrc: Annotate struct io_mapped_ubuf with __counted_by Kees Cook
2023-08-17 21:26 ` Gustavo A. R. Silva
2023-08-18 1:15 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox