Skip to contentSkip to conversation

dmaengine: xilinx_dma: check for invalid vdma interleaved parameters

PATCH Applied Peter Korsgaard 3 participants 3 messages Jan 5, 2024 – Jan 22, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dmaengine: xilinx_dma: check for invalid vdma interleaved parameters

The VDMA HSIZE register (corresponding to sgl[0].size) is only 16bit wide / the VSIZE register (corresponding to numf) is only 13bit wide, so reject requests not fitting within that rather than silently transferring too little data.

---
 drivers/dma/xilinx/xilinx_dma.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/dma/xilinx/xilinx_dma.c +6 -0
index e40696f6f864..5eb51ae93e89 100644
@@ -112,7 +112,9 @@
 
 /* Register Direct Mode Registers */
 #define XILINX_DMA_REG_VSIZE			0x0000
+#define XILINX_DMA_VSIZE_MASK			GENMASK(12, 0)
 #define XILINX_DMA_REG_HSIZE			0x0004
+#define XILINX_DMA_HSIZE_MASK			GENMASK(15, 0)
 
 #define XILINX_DMA_REG_FRMDLY_STRIDE		0x0008
 #define XILINX_DMA_FRMDLY_STRIDE_FRMDLY_SHIFT	24
@@ -2050,6 +2052,10 @@ xilinx_vdma_dma_prep_interleaved(struct dma_chan *dchan,
 	if (!xt->numf || !xt->sgl[0].size)
 		return NULL;
 
+	if (xt->numf & ~XILINX_DMA_VSIZE_MASK ||
+	    xt->sgl[0].size & ~XILINX_DMA_HSIZE_MASK)
+		return NULL;
+
 	if (xt->frame_size != 1)
 		return NULL;
 
Signature · 1 line
2.39.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines

-----Original Message-----
From: Peter Korsgaard <[email protected]>
Sent: Friday, January 5, 2024 4:30 PM
To: Vinod Koul <[email protected]>; [email protected]
Cc: Michal Simek <[email protected]>; Peter Korsgaard <[email protected]>
Subject: [PATCH] dmaengine: xilinx_dma: check for invalid vdma interleaved parameters

Quoted 5 lines

The VDMA HSIZE register (corresponding to sgl[0].size) is only 16bit wide / the VSIZE register (corresponding to numf) is only 13bit wide, so reject requests not fitting within that rather than silently transferring too little data.

Thanks!

Quoted 33 lines
---
 drivers/dma/xilinx/xilinx_dma.c | 6 ++++++
 1 file changed, 6 insertions(+)
(quoted diff) +0 -0

b/drivers/dma/xilinx/xilinx_dma.c index e40696f6f864..5eb51ae93e89 100644

drivers/dma/xilinx/xilinx_dma.c +6 -1
@@ -112,7 +112,9 @@
 
 /* Register Direct Mode Registers */
 #define XILINX_DMA_REG_VSIZE			0x0000
+#define XILINX_DMA_VSIZE_MASK			GENMASK(12, 0)
 #define XILINX_DMA_REG_HSIZE			0x0004
+#define XILINX_DMA_HSIZE_MASK			GENMASK(15, 0)
 
 #define XILINX_DMA_REG_FRMDLY_STRIDE		0x0008
 #define XILINX_DMA_FRMDLY_STRIDE_FRMDLY_SHIFT	24
@@ -2050,6 +2052,10 @@ xilinx_vdma_dma_prep_interleaved(struct
 dma_chan *dchan,
 	if (!xt->numf || !xt->sgl[0].size)
 		return NULL;
 
+	if (xt->numf & ~XILINX_DMA_VSIZE_MASK ||
+	    xt->sgl[0].size & ~XILINX_DMA_HSIZE_MASK)
+		return NULL;
+
 	if (xt->frame_size != 1)
 		return NULL;
 
--

2.39.2

maintainer Applied
#2 lore raw
In reply to Peter Korsgaard
Quoted 6 lines · Peter Korsgaard

The VDMA HSIZE register (corresponding to sgl[0].size) is only 16bit wide / the VSIZE register (corresponding to numf) is only 13bit wide, so reject requests not fitting within that rather than silently transferring too little data.

Applied, thanks!

[1/1] dmaengine: xilinx_dma: check for invalid vdma interleaved parameters

      commit: 8fcc3f7dbdaeff3c3be47a15d1acd7863dfee92d

Best regards,

Signature · 1 line
~Vinod