[PATCH] drivers/iommu: fix null-ptr-deref bug of rk_iommu_from_dev's ret-val

[tangzhenhao]

From: Sugar 

we should check the ret-val of function rk_iommu_from_dev to avoid 
null-ptr-deref.

Signed-off-by: Sugar 
---
 drivers/iommu/rockchip-iommu.c | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index e5d86b7177de..311d9eec06f4 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -1064,6 +1064,9 @@ static struct iommu_device *rk_iommu_probe_device(struct 
device *dev)
return ERR_PTR(-ENODEV);
 
iommu = rk_iommu_from_dev(dev);
+   if (!iommu) {
+   return ERR_PTR(-ENODEV);
+   }
 
data->link = device_link_add(dev, iommu->dev,
 DL_FLAG_STATELESS | DL_FLAG_PM_RUNTIME);
@@ -1083,6 +1086,9 @@ static struct iommu_group *rk_iommu_device_group(struct 
device *dev)
struct rk_iommu *iommu;
 
iommu = rk_iommu_from_dev(dev);
+   if (!iommu) {
+   return ERR_PTR(-ENODEV);
+   }
 
return iommu_group_ref_get(iommu->group);
 }
-- 
2.29.2

___
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

[PATCH] drivers/iommu: fix a null-ptr-deref bug in fsl_pamu_domain.c

[tangzhenhao]

At line 362 in drivers/iommu/fsl_pamu_domain.c, the ret-val of 
kmem_cache_zalloc should be checked to avoid null-ptr-deref bug.

Signed-off-by: tangzhenhao 
---
 drivers/iommu/fsl_pamu_domain.c | 4 
 1 file changed, 4 insertions(+)

diff --git a/drivers/iommu/fsl_pamu_domain.c b/drivers/iommu/fsl_pamu_domain.c
index b2110767caf4..9ebd5135f4a8 100644
--- a/drivers/iommu/fsl_pamu_domain.c
+++ b/drivers/iommu/fsl_pamu_domain.c
@@ -360,6 +360,10 @@ static void attach_device(struct fsl_dma_domain 
*dma_domain, int liodn, struct d
}
 
info = kmem_cache_zalloc(iommu_devinfo_cache, GFP_ATOMIC);
+   if (!info) {
+   pr_debug("device_domain_info allocation failed\n");
+   return;
+   }
 
info->dev = dev;
info->liodn = liodn;
-- 
2.17.1

___
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

[PATCH] drivers/iommu: fix a null-ptr-deref bug in msm_iommu.c

[tangzhenhao]

At line 600 in drivers/iommu/msm_iommu.c, the ret-val of kzalloc should be 
checked to avoid null-ptr-deref bug.

Signed-off-by: tangzhenhao 
---
 drivers/iommu/msm_iommu.c | 4 
 1 file changed, 4 insertions(+)

diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c
index 3615cd6241c4..e3c576e5babb 100644
--- a/drivers/iommu/msm_iommu.c
+++ b/drivers/iommu/msm_iommu.c
@@ -598,6 +598,10 @@ static void insert_iommu_master(struct device *dev,
 
if (list_empty(&(*iommu)->ctx_list)) {
master = kzalloc(sizeof(*master), GFP_ATOMIC);
+   if (!master) {
+   dev_err(dev, "Failed to allocate IOMMU context bank 
instance\n");
+   return;
+   }
master->of_node = dev->of_node;
list_add(>list, &(*iommu)->ctx_list);
dev_iommu_priv_set(dev, master);
-- 
2.17.1

___
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu