summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTang Bin <tangbin@cmss.chinamobile.com>2020-04-18 21:47:03 +0800
committerJoerg Roedel <jroedel@suse.de>2020-05-01 13:37:23 +0200
commitb52649aee6243ea661905bdc5fbe28cc5f6dec76 (patch)
treec9eda5b546f9594a44e30089205143754130f862
parentae74c19faa7d7996e857e13165bd40fc4a285e0d (diff)
downloadlinux-stable-b52649aee6243ea661905bdc5fbe28cc5f6dec76.tar.gz
linux-stable-b52649aee6243ea661905bdc5fbe28cc5f6dec76.tar.bz2
linux-stable-b52649aee6243ea661905bdc5fbe28cc5f6dec76.zip
iommu/qcom: Fix local_base status check
The function qcom_iommu_device_probe() does not perform sufficient error checking after executing devm_ioremap_resource(), which can result in crashes if a critical error path is encountered. Fixes: 0ae349a0f33f ("iommu/qcom: Add qcom_iommu") Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Link: https://lore.kernel.org/r/20200418134703.1760-1-tangbin@cmss.chinamobile.com Signed-off-by: Joerg Roedel <jroedel@suse.de>
-rw-r--r--drivers/iommu/qcom_iommu.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/iommu/qcom_iommu.c b/drivers/iommu/qcom_iommu.c
index 0e2a96467767..5b3b270972f8 100644
--- a/drivers/iommu/qcom_iommu.c
+++ b/drivers/iommu/qcom_iommu.c
@@ -824,8 +824,11 @@ static int qcom_iommu_device_probe(struct platform_device *pdev)
qcom_iommu->dev = dev;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (res)
+ if (res) {
qcom_iommu->local_base = devm_ioremap_resource(dev, res);
+ if (IS_ERR(qcom_iommu->local_base))
+ return PTR_ERR(qcom_iommu->local_base);
+ }
qcom_iommu->iface_clk = devm_clk_get(dev, "iface");
if (IS_ERR(qcom_iommu->iface_clk)) {