* [PATCH AUTOSEL 4.14 16/16] iommu/qcom: Fix local_base status check
[not found] <20200507142943.26848-1-sashal@kernel.org>
@ 2020-05-07 14:29 ` Sasha Levin
0 siblings, 0 replies; only message in thread
From: Sasha Levin @ 2020-05-07 14:29 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Tang Bin, Bjorn Andersson, Joerg Roedel, Sasha Levin,
linux-arm-msm, iommu
From: Tang Bin <tangbin@cmss.chinamobile.com>
[ Upstream commit b52649aee6243ea661905bdc5fbe28cc5f6dec76 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/iommu/qcom_iommu.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/qcom_iommu.c b/drivers/iommu/qcom_iommu.c
index b08002851e068..920a5df319bc4 100644
--- a/drivers/iommu/qcom_iommu.c
+++ b/drivers/iommu/qcom_iommu.c
@@ -775,8 +775,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)) {
--
2.20.1
^ permalink raw reply related [flat|nested] only message in thread