Skip to contentSkip to conversation

dmaengine: ioat: set error code on failures

PATCH In review Pan Bian 2 participants 2 messages Dec 2, 2016 – Dec 6, 2016 dmaengine

lore
Share & tools
lore

Pan Bian

author
#0 lore raw

PATCH 1/2 dmaengine: ioat: set error code on failures

In function ioat_dma_self_test(), when the calls to dma_mapping_error() fails, the value of return variable err is 0 (indicates no error). As a result, the return value may be inconsistent with the execution status. This patch fixes the bug by assigning -ENOMEM to err on the error path.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=188591

---
 drivers/dma/ioat/init.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/dma/ioat/init.c +2 -0
index 015f711..32383ef 100644
@@ -340,11 +340,13 @@ static int ioat_dma_self_test(struct ioatdma_device *ioat_dma)
 	dma_src = dma_map_single(dev, src, IOAT_TEST_SIZE, DMA_TO_DEVICE);
 	if (dma_mapping_error(dev, dma_src)) {
 		dev_err(dev, "mapping src buffer failed\n");
+		err = -ENOMEM;
 		goto free_resources;
 	}
 	dma_dest = dma_map_single(dev, dest, IOAT_TEST_SIZE, DMA_FROM_DEVICE);
 	if (dma_mapping_error(dev, dma_dest)) {
 		dev_err(dev, "mapping dest buffer failed\n");
+		err = -ENOMEM;
 		goto unmap_src;
 	}
 	flags = DMA_PREP_INTERRUPT;
Signature · 1 line
1.9.1
#1 lore raw
Quoted 4 lines · Pan Bian

In function ioat_dma_self_test(), when the calls to dma_mapping_error() fails, the value of return variable err is 0 (indicates no error). As a result, the return value may be inconsistent with the execution status. This patch fixes the bug by assigning -ENOMEM to err on the error path.

This was v2 of the series so you should tag it as PATCH v2. You can do so with --subject-prefix in git format-patch command.

Applied both now with Dave's Acks

Signature · 1 line
~Vinod