Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753707AbbKLHrT (ORCPT ); Thu, 12 Nov 2015 02:47:19 -0500 Received: from mail-wm0-f48.google.com ([74.125.82.48]:34604 "EHLO mail-wm0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753455AbbKLHrS (ORCPT ); Thu, 12 Nov 2015 02:47:18 -0500 From: LABBE Corentin To: baruch@tkos.co.il, clabbe.montjoie@gmail.com, computersforpeace@gmail.com, dwmw2@infradead.org, fransklaver@gmail.com, k.kozlowski.k@gmail.com, luis@debethencourt.com, s.hauer@pengutronix.de, u.kleine-koenig@pengutronix.de Cc: linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org Subject: [PATCH] mtd: nand: mxc_nand: fix a possible NULL dereference Date: Thu, 12 Nov 2015 08:46:55 +0100 Message-Id: <1447314423-31225-1-git-send-email-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.4.10 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1249 Lines: 40 of_match_device could return NULL, and so cause a NULL pointer dereference later. Signed-off-by: LABBE Corentin --- drivers/mtd/nand/mxc_nand.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c index 136e73a..9e42431 100644 --- a/drivers/mtd/nand/mxc_nand.c +++ b/drivers/mtd/nand/mxc_nand.c @@ -1464,8 +1464,7 @@ static int __init mxcnd_probe_dt(struct mxc_nand_host *host) { struct device_node *np = host->dev->of_node; struct mxc_nand_platform_data *pdata = &host->pdata; - const struct of_device_id *of_id = - of_match_device(mxcnd_dt_ids, host->dev); + const struct of_device_id *of_id; int buswidth; if (!np) @@ -1482,6 +1481,9 @@ static int __init mxcnd_probe_dt(struct mxc_nand_host *host) pdata->width = buswidth / 8; + of_id = of_match_device(mxcnd_dt_ids, host->dev); + if (!of_id) + return -ENODEV; host->devtype_data = of_id->data; return 0; -- 2.4.10 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/