Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754766AbbKTHqX (ORCPT ); Fri, 20 Nov 2015 02:46:23 -0500 Received: from mail-wm0-f43.google.com ([74.125.82.43]:33588 "EHLO mail-wm0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758762AbbKTHp0 (ORCPT ); Fri, 20 Nov 2015 02:45:26 -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 v2 2/2] mtd: nand: atmel_nand: fix a possible NULL dereference Date: Fri, 20 Nov 2015 08:45:17 +0100 Message-Id: <1448005517-26004-3-git-send-email-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.4.10 In-Reply-To: <1448005517-26004-1-git-send-email-clabbe.montjoie@gmail.com> References: <1448005517-26004-1-git-send-email-clabbe.montjoie@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1109 Lines: 32 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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index 475c938..7902967 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c @@ -1496,8 +1496,9 @@ static int atmel_of_init_port(struct atmel_nand_host *host, struct atmel_nand_data *board = &host->board; enum of_gpio_flags flags = 0; - host->caps = (struct atmel_nand_caps *) - of_match_device(atmel_nand_dt_ids, host->dev)->data; + host->caps = of_device_get_match_data(host->dev); + if (!host->caps) + return 1; 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/