Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecf93ef5 authored by Tang Bin's avatar Tang Bin Committed by Greg Kroah-Hartman
Browse files

iommu/qcom: Fix local_base status check 



commit b52649aee6243ea661905bdc5fbe28cc5f6dec76 upstream.

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: 0ae349a0 ("iommu/qcom: Add qcom_iommu")
Signed-off-by: default avatarTang Bin <tangbin@cmss.chinamobile.com>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20200418134703.1760-1-tangbin@cmss.chinamobile.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 440e1523

drivers/iommu/qcom_iommu.c

+4 −1
Original line number Diff line number Diff line
@@ -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)) {