[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAGhQ9VyGeYUuaHTOnte--ASX9Wvd5wkDrRDx8mRoD=aJqD7JTA@mail.gmail.com>
Date: Thu, 12 Nov 2015 09:29:57 +0100
From: Joachim Eastwood <manabian@...il.com>
To: LABBE Corentin <clabbe.montjoie@...il.com>
Cc: Brian Norris <computersforpeace@...il.com>,
David Woodhouse <dwmw2@...radead.org>, josh.wu@...el.com,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
linux-mtd@...ts.infradead.org
Subject: Re: [PATCH] mtd: nand: atmel_nand: fix a possible NULL dereference
On 12 November 2015 at 08:49, LABBE Corentin <clabbe.montjoie@...il.com> wrote:
> of_match_device could return NULL, and so cause a NULL pointer
> dereference later.
>
> Signed-off-by: LABBE Corentin <clabbe.montjoie@...il.com>
> ---
> 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;
It might be cleaner to use of_device_get_match_data() here.
regards,
Joachim Eastwood
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists