From: LABBE Corentin <clabbe.montjoie@gmail.com>
To: baruch@tkos.co.il, clabbe.montjoie@gmail.com,
computersforpeace@gmail.com, dwmw2@infradead.org,
fransklaver@gmail.com, k.kozlowski.k@gmail.com,
luis@debethencourt.com, s.hauer@pengutronix.de,
u.kleine-koenig@pengutronix.de
Cc: linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org
Subject: [PATCH] mtd: nand: mxc_nand: fix a possible NULL dereference
Date: Thu, 12 Nov 2015 08:46:55 +0100 [thread overview]
Message-ID: <1447314423-31225-1-git-send-email-clabbe.montjoie@gmail.com> (raw)
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/mxc_nand.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 136e73a..9e42431 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -1464,8 +1464,7 @@ static int __init mxcnd_probe_dt(struct mxc_nand_host *host)
{
struct device_node *np = host->dev->of_node;
struct mxc_nand_platform_data *pdata = &host->pdata;
- const struct of_device_id *of_id =
- of_match_device(mxcnd_dt_ids, host->dev);
+ const struct of_device_id *of_id;
int buswidth;
if (!np)
@@ -1482,6 +1481,9 @@ static int __init mxcnd_probe_dt(struct mxc_nand_host *host)
pdata->width = buswidth / 8;
+ of_id = of_match_device(mxcnd_dt_ids, host->dev);
+ if (!of_id)
+ return -ENODEV;
host->devtype_data = of_id->data;
return 0;
--
2.4.10
next reply other threads:[~2015-11-12 7:47 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-12 7:46 LABBE Corentin [this message]
2015-11-12 8:03 ` Frans Klaver
2015-11-12 8:26 ` Uwe Kleine-König
2015-11-12 8:36 ` Frans Klaver
2015-11-12 8:53 ` Uwe Kleine-König
2015-11-12 8:57 ` Frans Klaver
2015-11-12 9:01 ` Uwe Kleine-König
2015-11-12 8:19 ` Uwe Kleine-König
2015-11-12 10:03 ` LABBE Corentin
2015-11-12 10:14 ` Uwe Kleine-König
2015-11-16 18:33 ` Brian Norris
2015-11-16 19:12 ` Corentin LABBE
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=1447314423-31225-1-git-send-email-clabbe.montjoie@gmail.com \
--to=clabbe.montjoie@gmail.com \
--cc=baruch@tkos.co.il \
--cc=computersforpeace@gmail.com \
--cc=dwmw2@infradead.org \
--cc=fransklaver@gmail.com \
--cc=k.kozlowski.k@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=luis@debethencourt.com \
--cc=s.hauer@pengutronix.de \
--cc=u.kleine-koenig@pengutronix.de \
/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
all inboxes | Powered by JetHome®