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

[Stepan Moskovchenko]

  On 10/17/2010 7:51 AM, Vasiliy Kulikov wrote:
> 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: Vasiliy Kulikov<segooon at gmail.com>
> ---
>   arch/arm/mach-msm/iommu_dev.c |   22 +++++++++++++---------
>   1 files changed, 13 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm/mach-msm/iommu_dev.c b/arch/arm/mach-msm/iommu_dev.c
> index c33ae78..9019cee 100644
> --- a/arch/arm/mach-msm/iommu_dev.c
> +++ b/arch/arm/mach-msm/iommu_dev.c
> @@ -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;

Tested on hardware. Looks good. Thanks!

Acked-by: Stepan Moskovchenko <stepanm at codeaurora.org>

-- 
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.