linux-mtd.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: LABBE Corentin <clabbe.montjoie@gmail.com>
To: computersforpeace@gmail.com, dwmw2@infradead.org, josh.wu@atmel.com
Cc: LABBE Corentin <clabbe.montjoie@gmail.com>,
	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	[thread overview]
Message-ID: <1448005517-26004-3-git-send-email-clabbe.montjoie@gmail.com> (raw)
In-Reply-To: <1448005517-26004-1-git-send-email-clabbe.montjoie@gmail.com>

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 | 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

  parent reply	other threads:[~2015-11-20  7:45 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-20  7:45 [PATCH v2 0/2] fix a possible NULL dereference LABBE Corentin
2015-11-20  7:45 ` [PATCH v2 1/2] mtd: nand: atmel_nand: constify atmel_nand_caps structures LABBE Corentin
2015-11-20  8:28   ` Josh Wu
2015-11-20 17:57     ` Brian Norris
2015-11-20  7:45 ` LABBE Corentin [this message]
2015-11-20  8:33   ` [PATCH v2 2/2] mtd: nand: atmel_nand: fix a possible NULL dereference Josh Wu
2015-11-24 13:12     ` LABBE Corentin
2015-11-25  2:20       ` Josh Wu

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=1448005517-26004-3-git-send-email-clabbe.montjoie@gmail.com \
    --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 \
    /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;
as well as URLs for NNTP newsgroup(s).