skd: fix unchecked return values (d91dc172) · Commits · 戴 / test

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: ("skd: switch to the generic DMA API") Reviewed-by:

Christoph Hellwig <hch@lst.de> Signed-off-by:

Gustavo A. R. Silva <gustavo@embeddedor.com> Signed-off-by:

Jens Axboe <axboe@kernel.dk>

drivers/block/skd_main.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;

Admin message