Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162157AbbKTIdU (ORCPT ); Fri, 20 Nov 2015 03:33:20 -0500 Received: from nasmtp01.atmel.com ([192.199.1.246]:33378 "EHLO DVREDG02.corp.atmel.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1161851AbbKTIdT (ORCPT ); Fri, 20 Nov 2015 03:33:19 -0500 Subject: Re: [PATCH v2 2/2] mtd: nand: atmel_nand: fix a possible NULL dereference To: LABBE Corentin , , References: <1448005517-26004-1-git-send-email-clabbe.montjoie@gmail.com> <1448005517-26004-3-git-send-email-clabbe.montjoie@gmail.com> CC: , From: Josh Wu Message-ID: <564EDACA.30204@atmel.com> Date: Fri, 20 Nov 2015 16:33:14 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <1448005517-26004-3-git-send-email-clabbe.montjoie@gmail.com> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.168.5.13] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1340 Lines: 41 Hi, Corentin Thanks for the patch. It looks fine to me, just one nitpick in below: On 11/20/2015 3:45 PM, LABBE Corentin wrote: > 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; it's better to use -EINVAL here. Best Regards, Josh Wu > > if (of_property_read_u32(np, "atmel,nand-addr-offset", &val) == 0) { > if (val >= 32) { -- 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/