From mboxrd@z Thu Jan 1 00:00:00 1970 From: Axel Lin Subject: [PATCH] mmc: omap_hsmmc: Prevent potential NULL dereference Date: Mon, 18 Mar 2013 17:34:28 +0800 Message-ID: <1363599268.20778.1.camel@phoenix> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: Sender: linux-mmc-owner@vger.kernel.org To: Chris Ball Cc: Balaji T K , linux-mmc@vger.kernel.org, linux-omap@vger.kernel.org List-Id: linux-omap@vger.kernel.org of_get_hsmmc_pdata() may return NULL, thus ensure pdata is not NULL before dereference it. Signed-off-by: Axel Lin --- drivers/mmc/host/omap_hsmmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index bc58078..a8f9717 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -1774,7 +1774,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev) match = of_match_device(of_match_ptr(omap_mmc_of_match), &pdev->dev); if (match) { pdata = of_get_hsmmc_pdata(&pdev->dev); - if (match->data) { + if (pdata && match->data) { const u16 *offsetp = match->data; pdata->reg_offset = *offsetp; } -- 1.7.9.5