Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753756AbbKLHto (ORCPT ); Thu, 12 Nov 2015 02:49:44 -0500 Received: from mail-wm0-f46.google.com ([74.125.82.46]:38899 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752203AbbKLHtn (ORCPT ); Thu, 12 Nov 2015 02:49:43 -0500 From: LABBE Corentin To: computersforpeace@gmail.com, dwmw2@infradead.org, josh.wu@atmel.com Cc: LABBE Corentin , linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org Subject: [PATCH] mtd: nand: atmel_nand: fix a possible NULL dereference Date: Thu, 12 Nov 2015 08:49:39 +0100 Message-Id: <1447314579-31374-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: 1198 Lines: 35 of_match_device could return NULL, and so cause a NULL pointer dereference later. Signed-off-by: LABBE Corentin --- drivers/mtd/nand/atmel_nand.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index 475c938..f3cf68b 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c @@ -1495,9 +1495,12 @@ static int atmel_of_init_port(struct atmel_nand_host *host, int ecc_mode; struct atmel_nand_data *board = &host->board; enum of_gpio_flags flags = 0; + const struct of_device_id *of_id; - host->caps = (struct atmel_nand_caps *) - of_match_device(atmel_nand_dt_ids, host->dev)->data; + of_id = of_match_device(atmel_nand_dt_ids, host->dev); + if (!of_id) + return -ENODEV; + host->caps = of_id->data; if (of_property_read_u32(np, "atmel,nand-addr-offset", &val) == 0) { if (val >= 32) { -- 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/