diff options
| author |   Suman Anna <s-anna@ti.com> | 2013-02-01 20:24:51 -0600 |
|---|---|---|
| committer | Suman Anna <s-anna@ti.com> | 2013-06-11 09:44:02 -0500 |
| commit | a41677c6c5160f031038951fb94defeb93fe8160 (patch) | |
| tree | fdc800339a983bb153a67d52cd155a383c67e0d2 | |
| parent | Linux 3.10-rc5 (diff) | |
| download | linux-dev-a41677c6c5160f031038951fb94defeb93fe8160.tar.xz linux-dev-a41677c6c5160f031038951fb94defeb93fe8160.zip | |
omap: mailbox: check iomem resource before dereferencing it
Add a NULL check for iomem resource in mailbox probe functions.
Signed-off-by: Fernando Guzman Lugo <lugo.fernando@gmail.com>
Signed-off-by: Suman Anna <s-anna@ti.com>
| -rw-r--r-- | arch/arm/mach-omap1/mailbox.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/mailbox.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/mailbox.c b/arch/arm/mach-omap1/mailbox.c index efc8f207f6fc..a343d5f9a50a 100644 --- a/arch/arm/mach-omap1/mailbox.c +++ b/arch/arm/mach-omap1/mailbox.c @@ -152,6 +152,9 @@ static int omap1_mbox_probe(struct platform_device *pdev) list[0]->irq = platform_get_irq_byname(pdev, "dsp"); mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!mem) + return -ENOENT; + mbox_base = ioremap(mem->start, resource_size(mem)); if (!mbox_base) return -ENOMEM; diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c index 0b080267b7f6..9fe0bf2fef33 100644 --- a/arch/arm/mach-omap2/mailbox.c +++ b/arch/arm/mach-omap2/mailbox.c @@ -382,6 +382,9 @@ static int omap2_mbox_probe(struct platform_device *pdev) } mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!mem) + return -ENOENT; + mbox_base = ioremap(mem->start, resource_size(mem)); if (!mbox_base) return -ENOMEM; |