2016-12-02 14:50:16

by Pan Bian

Subject: [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

Signed-off-by: Pan Bian <[email protected]>
---
drivers/dma/ioat/init.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/dma/ioat/init.c b/drivers/dma/ioat/init.c
index 015f711..32383ef 100644
--- a/drivers/dma/ioat/init.c
+++ b/drivers/dma/ioat/init.c
@@ -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;
--
1.9.1

2016-12-06 04:50:11

by Vinod Koul

Subject: Re: [PATCH 1/2] dmaengine: ioat: set error code on failures

On Fri, Dec 02, 2016 at 10:49:01PM +0800, Pan Bian wrote:
> 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

--
~Vinod