android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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@gmail.com>
Acked-by: Stepan Moskovchenko <stepanm@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
This commit is contained in:
Vasiliy Kulikov 2010-10-17 18:51:37 +04:00 committed by Daniel Walker
parent efdfb2b118
commit a86c44d48a
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/arm/mach-msm/iommu_dev.c
View File

@ -128,7 +128,7 @@ static void msm_iommu_reset(void __iomem *base)
static int msm_iommu_probe(struct platform_device *pdev) static int msm_iommu_probe(struct platform_device *pdev)
{ {
struct resource *r; struct resource *r, *r2;
struct clk *iommu_clk; struct clk *iommu_clk;
struct msm_iommu_drvdata *drvdata; struct msm_iommu_drvdata *drvdata;
struct msm_iommu_dev *iommu_dev = pdev->dev.platform_data; 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; len = r->end - r->start + 1;
r = request_mem_region(r->start, len, r->name); r2 = request_mem_region(r->start, len, r->name);
if (!r) { if (!r2) {
pr_err("Could not request memory region: " pr_err("Could not request memory region: "
"start=%p, len=%d\n", (void *) r->start, len); "start=%p, len=%d\n", (void *) r->start, len);
ret = -EBUSY; ret = -EBUSY;
goto fail; goto fail;
} }
regs_base = ioremap(r->start, len); regs_base = ioremap(r2->start, len);
if (!regs_base) { if (!regs_base) {
pr_err("Could not ioremap: start=%p, len=%d\n", pr_err("Could not ioremap: start=%p, len=%d\n",
(void *) r->start, len); (void *) r2->start, len);
ret = -EBUSY; ret = -EBUSY;
goto fail; goto fail_mem;
} }
irq = platform_get_irq_byname(pdev, "secure_irq"); irq = platform_get_irq_byname(pdev, "secure_irq");
if (irq < 0) { if (irq < 0) {
ret = -ENODEV; ret = -ENODEV;
goto fail; goto fail_io;
} }
mb(); mb();
@ -211,14 +211,14 @@ static int msm_iommu_probe(struct platform_device *pdev)
if (GET_IDR(regs_base) == 0) { if (GET_IDR(regs_base) == 0) {
pr_err("Invalid IDR value detected\n"); pr_err("Invalid IDR value detected\n");
ret = -ENODEV; ret = -ENODEV;
goto fail; goto fail_io;
} }
ret = request_irq(irq, msm_iommu_fault_handler, 0, ret = request_irq(irq, msm_iommu_fault_handler, 0,
"msm_iommu_secure_irpt_handler", drvdata); "msm_iommu_secure_irpt_handler", drvdata);
if (ret) { if (ret) {
pr_err("Request IRQ %d failed with ret=%d\n", irq, ret); pr_err("Request IRQ %d failed with ret=%d\n", irq, ret);
goto fail; goto fail_io;
} }
msm_iommu_reset(regs_base); msm_iommu_reset(regs_base);
@ -237,6 +237,10 @@ static int msm_iommu_probe(struct platform_device *pdev)
return 0; return 0;
fail_io:
iounmap(regs_base);
fail_mem:
release_mem_region(r->start, len);
fail: fail:
kfree(drvdata); kfree(drvdata);
return ret; return ret;