From: LABBE Corentin <clabbe.montjoie@gmail.com>
To: Joachim Eastwood <manabian@gmail.com>
Cc: Brian Norris <computersforpeace@gmail.com>,
David Woodhouse <dwmw2@infradead.org>,
josh.wu@atmel.com,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
linux-mtd@lists.infradead.org
Subject: Re: [PATCH] mtd: nand: atmel_nand: fix a possible NULL dereference
Date: Thu, 12 Nov 2015 10:29:03 +0100 [thread overview]
Message-ID: <20151112092903.GB9850@Red> (raw)
In-Reply-To: <CAGhQ9VyGeYUuaHTOnte--ASX9Wvd5wkDrRDx8mRoD=aJqD7JTA@mail.gmail.com>
On Thu, Nov 12, 2015 at 09:29:57AM +0100, Joachim Eastwood wrote:
> On 12 November 2015 at 08:49, LABBE Corentin <clabbe.montjoie@gmail.com> wrote:
> > of_match_device could return NULL, and so cause a NULL pointer
> > dereference later.
> >
> > Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.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.
>
I agree, I will resend shortly with it.
And this time, I wont forgot the patch which permit to supress the kbuild_robot warning.
Regards
LABBE Corentin
next prev parent reply other threads:[~2015-11-12 9:29 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-12 7:49 [PATCH] mtd: nand: atmel_nand: fix a possible NULL dereference LABBE Corentin
2015-11-12 8:29 ` Joachim Eastwood
2015-11-12 9:29 ` LABBE Corentin [this message]
2015-11-12 9:06 ` kbuild test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151112092903.GB9850@Red \
--to=clabbe.montjoie@gmail.com \
--cc=computersforpeace@gmail.com \
--cc=dwmw2@infradead.org \
--cc=josh.wu@atmel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=manabian@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox