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

Commit a86c44d4 authored by Vasiliy Kulikov's avatar Vasiliy Kulikov Committed by Daniel Walker
Browse files

arm: mach-msm: fix error handling in msm_iommu_probe() 



msm_iommu_probe() didn't free mem_region and mapped IO.
Also if request_mem_region() failed then error handling
code dereferenced NULL pointer.

Signed-off-by: default avatarVasiliy Kulikov <segooon@gmail.com>
Acked-by: default avatarStepan Moskovchenko <stepanm@codeaurora.org>
Signed-off-by: default avatarDaniel Walker <dwalker@codeaurora.org>
parent efdfb2b1

arch/arm/mach-msm/iommu_dev.c

+13 −9
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static void msm_iommu_reset(void __iomem *base) 


static int msm_iommu_probe(struct platform_device *pdev)

{

	struct resource *r;

	struct resource *r, *r2;

	struct clk *iommu_clk;

	struct msm_iommu_drvdata *drvdata;

	struct msm_iommu_dev *iommu_dev = pdev->dev.platform_data;
@@ -183,27 +183,27 @@ static int msm_iommu_probe(struct platform_device *pdev) 


		len = r->end - r->start + 1;



		r = request_mem_region(r->start, len, r->name);

		if (!r) {

		r2 = request_mem_region(r->start, len, r->name);

		if (!r2) {

			pr_err("Could not request memory region: "

			"start=%p, len=%d\n", (void *) r->start, len);

			ret = -EBUSY;

			goto fail;

		}



		regs_base = ioremap(r->start, len);

		regs_base = ioremap(r2->start, len);



		if (!regs_base) {

			pr_err("Could not ioremap: start=%p, len=%d\n",

				 (void *) r->start, len);

				 (void *) r2->start, len);

			ret = -EBUSY;

			goto fail;

			goto fail_mem;

		}



		irq = platform_get_irq_byname(pdev, "secure_irq");

		if (irq < 0) {

			ret = -ENODEV;

			goto fail;

			goto fail_io;

		}



		mb();
@@ -211,14 +211,14 @@ static int msm_iommu_probe(struct platform_device *pdev) 
		if (GET_IDR(regs_base) == 0) {

			pr_err("Invalid IDR value detected\n");

			ret = -ENODEV;

			goto fail;

			goto fail_io;

		}



		ret = request_irq(irq, msm_iommu_fault_handler, 0,

				"msm_iommu_secure_irpt_handler", drvdata);

		if (ret) {

			pr_err("Request IRQ %d failed with ret=%d\n", irq, ret);

			goto fail;

			goto fail_io;

		}



		msm_iommu_reset(regs_base);
@@ -237,6 +237,10 @@ static int msm_iommu_probe(struct platform_device *pdev) 


	return 0;



fail_io:

	iounmap(regs_base);

fail_mem:

	release_mem_region(r->start, len);

fail:

	kfree(drvdata);

	return ret;