Skip to contentSkip to conversation

io_uring/rsrc: Annotate struct io_mapped_ubuf with __counted_by

PATCH Applied Kees Cook 3 participants 3 messages Aug 17, 2023 – Aug 18, 2023 io_uring

lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 io_uring/rsrc: Annotate struct io_mapped_ubuf with __counted_by

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

---
 io_uring/rsrc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
io_uring/rsrc.h +1 -1
index 8afa9ec66a55..8625181fb87a 100644
@@ -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);
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Kees Cook

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).

Quoted 8 lines

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

Thanks
--
Gustavo

Quoted 17 lines
---
  io_uring/rsrc.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
io_uring/rsrc.h +1 -1
index 8afa9ec66a55..8625181fb87a 100644
@@ -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);
maintainer Applied
#2 lore raw
In reply to Kees Cook
Quoted 9 lines · Kees Cook

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,

Signature · 1 line
Jens Axboe