From patchwork Tue Feb 12 04:57:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suman Anna X-Patchwork-Id: 2127311 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 906193FD4F for ; Tue, 12 Feb 2013 05:07:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750875Ab3BLFDP (ORCPT ); Tue, 12 Feb 2013 00:03:15 -0500 Received: from arroyo.ext.ti.com ([192.94.94.40]:47267 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1749667Ab3BLFDO (ORCPT ); Tue, 12 Feb 2013 00:03:14 -0500 Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id r1C52Mp5014357; Mon, 11 Feb 2013 23:02:22 -0600 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id r1C52MAQ012924; Mon, 11 Feb 2013 23:02:22 -0600 Received: from dlelxv22.itg.ti.com (172.17.1.197) by dfle72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.1.323.3; Mon, 11 Feb 2013 23:02:21 -0600 Received: from localhost (irmo.am.dhcp.ti.com [128.247.74.241]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id r1C52Mbl009641; Mon, 11 Feb 2013 23:02:22 -0600 From: Suman Anna To: Greg Kroah-Hartman CC: Linus Walleij , Russell King , Tony Lindgren , Arnd Bergmann , Ohad Ben-Cohen , Paul Walmsley , Benoit Cousson , Loic Pallardy , Omar Ramirez Luna , , , , Mark Brown , Janusz Krzysztofik , Dom Cobley , Wim Van Sebroeck , Felipe Contreras , Tejun Heo , Omar Ramirez Luna , Suman Anna , Fernando Guzman Lugo Subject: [PATCH v2 11/13] mailbox/omap: check iomem resource before dereferencing it Date: Mon, 11 Feb 2013 22:57:10 -0600 Message-ID: <1360645032-9668-12-git-send-email-s-anna@ti.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1360645032-9668-1-git-send-email-s-anna@ti.com> References: <1360645032-9668-1-git-send-email-s-anna@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Add a NULL check for iomem resource in mailbox probe functions. Signed-off-by: Fernando Guzman Lugo Signed-off-by: Suman Anna --- drivers/mailbox/mailbox-omap1.c | 3 +++ drivers/mailbox/mailbox-omap2.c | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/drivers/mailbox/mailbox-omap1.c b/drivers/mailbox/mailbox-omap1.c index 295c32a..5b0f2c1 100644 --- a/drivers/mailbox/mailbox-omap1.c +++ b/drivers/mailbox/mailbox-omap1.c @@ -179,6 +179,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 -ENOMEM; + mbox_base = ioremap(mem->start, resource_size(mem)); if (!mbox_base) return -ENOMEM; diff --git a/drivers/mailbox/mailbox-omap2.c b/drivers/mailbox/mailbox-omap2.c index d3a3d84..9fbd491 100644 --- a/drivers/mailbox/mailbox-omap2.c +++ b/drivers/mailbox/mailbox-omap2.c @@ -293,6 +293,11 @@ static int omap2_mbox_probe(struct platform_device *pdev) } mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!mem) { + ret = -ENOMEM; + goto free; + } + mbox_base = ioremap(mem->start, resource_size(mem)); if (!mbox_base) { ret = -ENOMEM;