Skip to content

Commit b52649a

Browse files
Tang Binjoergroedel
authored andcommitted
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: 0ae349a ("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>
1 parent ae74c19 commit b52649a

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

drivers/iommu/qcom_iommu.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -824,8 +824,11 @@ static int qcom_iommu_device_probe(struct platform_device *pdev)
824824
qcom_iommu->dev = dev;
825825

826826
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
827-
if (res)
827+
if (res) {
828828
qcom_iommu->local_base = devm_ioremap_resource(dev, res);
829+
if (IS_ERR(qcom_iommu->local_base))
830+
return PTR_ERR(qcom_iommu->local_base);
831+
}
829832

830833
qcom_iommu->iface_clk = devm_clk_get(dev, "iface");
831834
if (IS_ERR(qcom_iommu->iface_clk)) {

0 commit comments

Comments
 (0)