Skip to contentSkip to conversation

nvmem: zynqmp_nvmem: Fix buffer size in DMA and memcpy

PATCH Applied Harsh Jain 2 participants 2 messages Jan 19 – Mar 12

Subsystems (4)
lore
Share & tools
lore

Harsh Jain

author
#0 lore raw

PATCH v2 1/1 nvmem: zynqmp_nvmem: Fix buffer size in DMA and memcpy

From: Ivan Vera <[email protected]>

Buffer size used in dma allocation and memcpy is wrong. It can lead to undersized DMA buffer access and possible memory corruption. use correct buffer size in dma_alloc_coherent and memcpy.

Fixes 737c0c8d07b5 ("nvmem: zynqmp_nvmem: Add support to access efuse")

---
Changes in v2:
- Fixed sign-off email and added stable kernel

 drivers/nvmem/zynqmp_nvmem.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/nvmem/zynqmp_nvmem.c +4 -4
index 8682adaacd69..3e5975231269 100644
@@ -66,7 +66,7 @@ static int zynqmp_efuse_access(void *context, unsigned int offset,
 	dma_addr_t dma_buf;
 	size_t words = bytes / WORD_INBYTES;
 	int ret;
-	int value;
+	unsigned int value;
 	char *data;
 
 	if (bytes % WORD_INBYTES != 0) {
@@ -80,7 +80,7 @@ static int zynqmp_efuse_access(void *context, unsigned int offset,
 	}
 
 	if (pufflag == 1 && flag == EFUSE_WRITE) {
-		memcpy(&value, val, bytes);
+		memcpy(&value, val, sizeof(value));
 		if ((offset == EFUSE_PUF_START_OFFSET ||
 		     offset == EFUSE_PUF_MID_OFFSET) &&
 		    value & P_USER_0_64_UPPER_MASK) {
@@ -100,7 +100,7 @@ static int zynqmp_efuse_access(void *context, unsigned int offset,
 	if (!efuse)
 		return -ENOMEM;
 
-	data = dma_alloc_coherent(dev, sizeof(bytes),
+	data = dma_alloc_coherent(dev, bytes,
 				  &dma_buf, GFP_KERNEL);
 	if (!data) {
 		ret = -ENOMEM;
@@ -134,7 +134,7 @@ static int zynqmp_efuse_access(void *context, unsigned int offset,
 	if (flag == EFUSE_READ)
 		memcpy(val, data, bytes);
 efuse_access_err:
-	dma_free_coherent(dev, sizeof(bytes),
+	dma_free_coherent(dev, bytes,
 			  data, dma_buf);
 efuse_data_fail:
 	dma_free_coherent(dev, sizeof(struct xilinx_efuse),

base-commit: 4cece764965020c22cff7665b18a012006359095

Signature · 1 line
2.34.1
maintainer Applied
#1 lore raw
Quoted 6 lines · Harsh Jain

Buffer size used in dma allocation and memcpy is wrong. It can lead to undersized DMA buffer access and possible memory corruption. use correct buffer size in dma_alloc_coherent and memcpy.

Applied, thanks!

[1/1] nvmem: zynqmp_nvmem: Fix buffer size in DMA and memcpy

      commit: 93a1b86f51c8c552db86216f065af42cadf5595d

Best regards,

Signature · 1 line
Srinivas Kandagatla <[email protected]>