skd: fix unchecked return values

PATCH Applied Gustavo A. R. Silva 3 participants 3 messages Oct 19, 2018 – Oct 22, 2018 Block layer

lore

Share & tools

lore

Gustavo A. R. Silva

author

2018-10-19 18:44 UTC #0 lore raw

PATCH 1/1 skd: fix unchecked return values

Check return values of dma_set_mask_and_coherent().

Otherwise, if dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); fails, the following piece of code will be executed even when the call to dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); returns 0:

dev_err(&pdev->dev, "DMA mask error %d\n", rc);
goto err_out_regions;

Addresses-Coverity-ID: 1474553 ("Unchecked return value")

Fixes 138126214868 ("skd: switch to the generic DMA API")

Signed-off-by Gustavo A. R. Silva <[email protected]>

---
 drivers/block/skd_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

drivers/block/skd_main.c +2 -2

index 7c5fc69..2459dcc 100644
@@ -3175,7 +3175,7 @@ static int skd_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 		goto err_out;
 	rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
 	if (rc)
-		dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
+		rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
 	if (rc) {
 		dev_err(&pdev->dev, "DMA mask error %d\n", rc);
 		goto err_out_regions;

@@ -3364,7 +3364,7 @@ static int skd_pci_resume(struct pci_dev *pdev)
 		goto err_out;
 	rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
 	if (rc)
-		dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
+		rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
 	if (rc) {
 		dev_err(&pdev->dev, "DMA mask error %d\n", rc);
 		goto err_out_regions;

Signature · 1 line

2.7.4

Christoph Hellwig

Reviewed-by on v1 1/1

2018-10-22 09:14 UTC #1 lore raw

Quoted 6 lines · Gustavo A. R. Silva

Check return values of dma_set_mask_and_coherent().
Otherwise, if dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); fails, the following piece of code will be executed even when the call to dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); returns 0:

Quoted 6 lines

dev_err(&pdev->dev, "DMA mask error %d\n", rc);
goto err_out_regions;
Addresses-Coverity-ID: 1474553 ("Unchecked return value")
Fixes 138126214868 ("skd: switch to the generic DMA API")
Signed-off-by Gustavo A. R. Silva <[email protected]>

Thanks, looks good:

Reviewed-by Christoph Hellwig <[email protected]>

Jens Axboe

maintainer Applied

2018-10-22 09:16 UTC #2 lore raw

In reply to Gustavo A. R. Silva

Quoted 8 lines · Gustavo A. R. Silva

Check return values of dma_set_mask_and_coherent().
Otherwise, if dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); fails, the following piece of code will be executed even when the call to dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); returns 0:
dev_err(&pdev->dev, "DMA mask error %d\n", rc);
goto err_out_regions;

Applied, thanks.

Signature · 1 line

Jens Axboe