From: Colin King <colin.king@canonical.com>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Andrew Duggan <aduggan@synaptics.com>,
Benjamin Tissoires <benjamin.tissoires@redhat.com>,
Lyude Paul <thatslyude@gmail.com>,
Dennis Wassenberg <dennis.wassenberg@secunet.com>,
linux-input@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] input: synaptics-rmi4: check for null rmi_dev before it is dereferenced
Date: Tue, 20 Dec 2016 10:07:50 +0000 [thread overview]
Message-ID: <20161220100750.8033-1-colin.king@canonical.com> (raw)
From: Colin Ian King <colin.king@canonical.com>
rmi_dev is currently being dereferenced before it null checked, so we
have a potential null pointer dereference issue with this. Fix this
by dereferencing rmi_dev after a null check has been performed.
Fixes CoverityScan CID 1391218 ("Dereference before null check")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/input/rmi4/rmi_f03.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/input/rmi4/rmi_f03.c b/drivers/input/rmi4/rmi_f03.c
index 8a7ca3e..008f42a 100644
--- a/drivers/input/rmi4/rmi_f03.c
+++ b/drivers/input/rmi4/rmi_f03.c
@@ -164,7 +164,7 @@ static int rmi_f03_config(struct rmi_function *fn)
static int rmi_f03_attention(struct rmi_function *fn, unsigned long *irq_bits)
{
struct rmi_device *rmi_dev = fn->rmi_dev;
- struct rmi_driver_data *drvdata = dev_get_drvdata(&rmi_dev->dev);
+ struct rmi_driver_data *drvdata;
struct f03_data *f03 = dev_get_drvdata(&fn->dev);
u16 data_addr = fn->fd.data_base_addr;
const u8 ob_len = f03->rx_queue_length * RMI_F03_OB_SIZE;
@@ -178,6 +178,7 @@ static int rmi_f03_attention(struct rmi_function *fn, unsigned long *irq_bits)
if (!rmi_dev)
return -ENODEV;
+ drvdata = dev_get_drvdata(&rmi_dev->dev);
if (drvdata->attn_data.data) {
/* First grab the data passed by the transport device */
if (drvdata->attn_data.size < ob_len) {
--
2.10.2
next reply other threads:[~2016-12-20 10:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-20 10:07 Colin King [this message]
2016-12-20 21:22 ` [PATCH] input: synaptics-rmi4: check for null rmi_dev before it is dereferenced Dmitry Torokhov
2016-12-21 14:41 ` Colin Ian King
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=20161220100750.8033-1-colin.king@canonical.com \
--to=colin.king@canonical.com \
--cc=aduggan@synaptics.com \
--cc=benjamin.tissoires@redhat.com \
--cc=dennis.wassenberg@secunet.com \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=thatslyude@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;
as well as URLs for NNTP newsgroup(s).