From: LABBE Corentin <clabbe.montjoie@gmail.com>
To: lee.jones@linaro.org
Cc: linux-kernel@vger.kernel.org, LABBE Corentin <clabbe.montjoie@gmail.com>
Subject: [PATCH 2/2] mfd: mc13xxx: fix a possible NULL dereference
Date: Tue, 16 Aug 2016 10:15:22 +0200 [thread overview]
Message-ID: <1471335322-6814-2-git-send-email-clabbe.montjoie@gmail.com> (raw)
In-Reply-To: <1471335322-6814-1-git-send-email-clabbe.montjoie@gmail.com>
of_match_device could return NULL, and so cause a NULL pointer
dereference later.
For fixing this problem, we use of_device_get_match_data(), this will
simplify the code a little by using a standard function for
getting the match data.
Reported-by: coverity (CID 986513)
Reported-by: coverity (CID 986514)
Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com>
---
drivers/mfd/mc13xxx-i2c.c | 4 +---
drivers/mfd/mc13xxx-spi.c | 5 +----
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/mfd/mc13xxx-i2c.c b/drivers/mfd/mc13xxx-i2c.c
index 3c00ccb..8ad7593 100644
--- a/drivers/mfd/mc13xxx-i2c.c
+++ b/drivers/mfd/mc13xxx-i2c.c
@@ -78,9 +78,7 @@ static int mc13xxx_i2c_probe(struct i2c_client *client,
}
if (client->dev.of_node) {
- const struct of_device_id *of_id =
- of_match_device(mc13xxx_dt_ids, &client->dev);
- mc13xxx->variant = of_id->data;
+ mc13xxx->variant = of_device_get_match_data(&client->dev);
} else {
mc13xxx->variant = (const struct mc13xxx_variant *)id->driver_data;
}
diff --git a/drivers/mfd/mc13xxx-spi.c b/drivers/mfd/mc13xxx-spi.c
index 6100025..3b4f5ba 100644
--- a/drivers/mfd/mc13xxx-spi.c
+++ b/drivers/mfd/mc13xxx-spi.c
@@ -155,10 +155,7 @@ static int mc13xxx_spi_probe(struct spi_device *spi)
}
if (spi->dev.of_node) {
- const struct of_device_id *of_id =
- of_match_device(mc13xxx_dt_ids, &spi->dev);
-
- mc13xxx->variant = of_id->data;
+ mc13xxx->variant = of_device_get_match_data(&spi->dev);
} else {
const struct spi_device_id *id_entry = spi_get_device_id(spi);
--
2.7.3
next prev parent reply other threads:[~2016-08-16 8:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-16 8:15 [PATCH 1/2] mfd: mc13xxx: constify mc13xxx_variant LABBE Corentin
2016-08-16 8:15 ` LABBE Corentin [this message]
2016-08-31 9:23 ` [PATCH 2/2] mfd: mc13xxx: fix a possible NULL dereference Lee Jones
2016-08-31 9:20 ` [PATCH 1/2] mfd: mc13xxx: constify mc13xxx_variant Lee Jones
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=1471335322-6814-2-git-send-email-clabbe.montjoie@gmail.com \
--to=clabbe.montjoie@gmail.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.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).