ソースを参照

sparc64: move dereference after check for NULL

We shouldn't dereference "iommu" until after we have checked that it is
non-NULL.

Fixes: f08978b0fdbf ("sparc64: Enable sun4v dma ops to use IOMMU v2 APIs")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Dan Carpenter 8 年 前
コミット
efca4885b5
1 ファイル変更2 行追加3 行削除
  1. 2 3
      arch/sparc/kernel/pci_sun4v.c

+ 2 - 3
arch/sparc/kernel/pci_sun4v.c

@@ -478,11 +478,10 @@ static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist,
 	BUG_ON(direction == DMA_NONE);
 	BUG_ON(direction == DMA_NONE);
 
 
 	iommu = dev->archdata.iommu;
 	iommu = dev->archdata.iommu;
-	atu = iommu->atu;
-
 	if (nelems == 0 || !iommu)
 	if (nelems == 0 || !iommu)
 		return 0;
 		return 0;
-	
+	atu = iommu->atu;
+
 	prot = HV_PCI_MAP_ATTR_READ;
 	prot = HV_PCI_MAP_ATTR_READ;
 	if (direction != DMA_TO_DEVICE)
 	if (direction != DMA_TO_DEVICE)
 		prot |= HV_PCI_MAP_ATTR_WRITE;
 		prot |= HV_PCI_MAP_ATTR_WRITE;