From ca10cd6483b6fad09b6770aa5551472af99166cd Mon Sep 17 00:00:00 2001 From: Jiankang Chen Date: Sat, 18 May 2019 22:09:57 +0800 Subject: [PATCH] iommu: Fix NULL pointer bug hulk inclusion category: feature bugzilla: 14369 CVE: NA ------------------- while acpi dev set error, the iommu_fwspec can become NULL, so, when group be abnormal, return errno. Signed-off-by: Jiankang Chen Signed-off-by: Fang Lijun Reviewed-by: Hanjun Guo Reviewed-by: Zhen Lei Signed-off-by: Yang Yingliang --- drivers/iommu/arm-smmu-v3.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c index 68b6b4f36aeb..614c7a14a331 100644 --- a/drivers/iommu/arm-smmu-v3.c +++ b/drivers/iommu/arm-smmu-v3.c @@ -2925,24 +2925,19 @@ static int arm_smmu_add_device(struct device *dev) if (ret) goto err_disable_ats; - ret = arm_smmu_insert_master(smmu, master); - if (ret) - goto err_unlink; - group = iommu_group_get_for_dev(dev); if (IS_ERR(group)) { ret = PTR_ERR(group); goto err_remove_master; } + arm_smmu_insert_master(smmu, master); iommu_group_put(group); return 0; err_remove_master: arm_smmu_remove_master(smmu, master); - -err_unlink: iommu_device_unlink(&smmu->iommu, dev); err_disable_ats: -- GitLab