[PATCH V4 1/6] iommu/arm-smmu: Fix the error path in arm_smmu_add_device

From	Vivek Gautam <vivek.gautam@codeaurora.org>
Newsgroups	linux.kernel
Subject	[PATCH V4 1/6] iommu/arm-smmu: Fix the error path in arm_smmu_add_device
Date	2017-07-06 11:40 +0200
Message-ID	<u0bqp-2sh-9@gated-at.bofh.it> (permalink)
References	<u0bqp-2sh-5@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

fwspec->iommu_priv is available only after arm_smmu_master_cfg
instance has been allocated. We shouldn't free it before that.
Also it's logical to free the master cfg itself without
checking for fwspec.

Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org>
---
 drivers/iommu/arm-smmu.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 9a45117d90de..61b1f8729a7c 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -1349,15 +1349,15 @@ static int arm_smmu_add_device(struct device *dev)
 
 	ret = arm_smmu_master_alloc_smes(dev);
 	if (ret)
-		goto out_free;
+		goto out_cfg_free;
 
 	iommu_device_link(&smmu->iommu, dev);
 
 	return 0;
 
+out_cfg_free:
+	kfree(cfg);
 out_free:
-	if (fwspec)
-		kfree(fwspec->iommu_priv);
 	iommu_fwspec_free(dev);
 	return ret;
 }
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH V4 1/6] iommu/arm-smmu: Fix the error path in arm_smmu_add_device Vivek Gautam <vivek.gautam@codeaurora.org> - 2017-07-06 11:40 +0200

csiph-web