Skip to contentSkip to conversation

dmaengine: fsl-edma: Annotate struct struct fsl_edma_engine with __counted_by

PATCH Applied Kees Cook 3 participants 3 messages Oct 3, 2023 – Oct 4, 2023

Subsystems (2)
lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 dmaengine: fsl-edma: Annotate struct struct fsl_edma_engine 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 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 struct fsl_edma_engine.

---
 drivers/dma/fsl-edma-common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/fsl-edma-common.h +1 -1
index 40d50cc3d75a..bb5221158a77 100644
@@ -225,7 +225,7 @@ struct fsl_edma_engine {
 	bool			big_endian;
 	struct edma_regs	regs;
 	u64			chan_masked;
-	struct fsl_edma_chan	chans[];
+	struct fsl_edma_chan	chans[] __counted_by(n_chans);
 };
 
 #define edma_read_tcdreg(chan, __name)				\
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 via CONFIG_UBSAN_BOUNDS (for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family functions).

Quoted 6 lines

As found with Coccinelle[1], add __counted_by for struct struct fsl_edma_engine.

Thanks
--
Gustavo

Quoted 17 lines
---
  drivers/dma/fsl-edma-common.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/fsl-edma-common.h +1 -1
index 40d50cc3d75a..bb5221158a77 100644
@@ -225,7 +225,7 @@ struct fsl_edma_engine {
  	bool			big_endian;
  	struct edma_regs	regs;
  	u64			chan_masked;
-	struct fsl_edma_chan	chans[];
+	struct fsl_edma_chan	chans[] __counted_by(n_chans);
  };
 
  #define edma_read_tcdreg(chan, __name)				\
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 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 struct fsl_edma_engine.

[...]

Applied, thanks!

[1/1] dmaengine: fsl-edma: Annotate struct struct fsl_edma_engine with __counted_by

      commit: c223bafdcbd51506df00509088efc62e08ef6c3f

Best regards,

Signature · 1 line
~Vinod