From: Andrew Duggan <aduggan@synaptics.com>
To: "linux-input@vger.kernel.org" <linux-input@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Cc: Andrew Duggan <aduggan@synaptics.com>,
Jiri Kosina <jikos@kernel.org>,
Benjamin Tissoires <benjamin.tissoires@redhat.com>,
Federico Cerutti <federico@ceres-c.it>,
Christopher Heiny <Cheiny@synaptics.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>
Subject: [PATCH] Input: synaptics-rmi4 - validate that the rmi_dev pointer is set before dereferencing it
Date: Wed, 23 Oct 2019 01:24:05 +0000 [thread overview]
Message-ID: <20191023012344.20998-2-aduggan@synaptics.com> (raw)
In-Reply-To: <20191023012344.20998-1-aduggan@synaptics.com>
A bug in hid-rmi was causing rmi_unregister_transport_device() to be
called even if the call to rmi_register_transport_device() failed to
allocate the rmi device. A patch has been submitted to fix the issue in
hid-rmi. This patch will ensure that should a simialr situation
occur then the rmi driver will not dereference a NULL pointer.
Signed-off-by: Andrew Duggan <aduggan@synaptics.com>
---
drivers/input/rmi4/rmi_bus.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/input/rmi4/rmi_bus.c b/drivers/input/rmi4/rmi_bus.c
index af706a583656..6c3abae1e159 100644
--- a/drivers/input/rmi4/rmi_bus.c
+++ b/drivers/input/rmi4/rmi_bus.c
@@ -118,8 +118,10 @@ void rmi_unregister_transport_device(struct rmi_transport_dev *xport)
{
struct rmi_device *rmi_dev = xport->rmi_dev;
- device_del(&rmi_dev->dev);
- put_device(&rmi_dev->dev);
+ if (rmi_dev) {
+ device_del(&rmi_dev->dev);
+ put_device(&rmi_dev->dev);
+ }
}
EXPORT_SYMBOL(rmi_unregister_transport_device);
--
2.20.1
next prev parent reply other threads:[~2019-10-23 1:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-23 1:24 [PATCH] HID: rmi: Check that the RMI_STARTED bit is set before unregistering the RMI transport device Andrew Duggan
2019-10-23 1:24 ` Andrew Duggan [this message]
2019-10-29 4:19 ` [PATCH] Input: synaptics-rmi4 - validate that the rmi_dev pointer is set before dereferencing it Dmitry Torokhov
2019-10-29 18:40 ` Andrew Duggan
2019-11-15 15:26 ` [PATCH] HID: rmi: Check that the RMI_STARTED bit is set before unregistering the RMI transport device Jiri Kosina
2019-11-15 18:18 ` Andrew Duggan
2019-11-18 9:24 ` Jiri Kosina
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=20191023012344.20998-2-aduggan@synaptics.com \
--to=aduggan@synaptics.com \
--cc=Cheiny@synaptics.com \
--cc=benjamin.tissoires@redhat.com \
--cc=dmitry.torokhov@gmail.com \
--cc=federico@ceres-c.it \
--cc=jikos@kernel.org \
--cc=linux-input@vger.kernel.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).