From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Samuel Thibault <samuel.thibault@ens-lyon.org>,
Peter Hutterer <peter.hutterer@who-t.net>
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
Benjamin Tissoires <benjamin.tissoires@redhat.com>,
stable@vger.kernel.org
Subject: [PATCH 2/2] input - leds: fix input_led_disconnect path
Date: Thu, 14 Dec 2017 14:25:22 +0100 [thread overview]
Message-ID: <20171214132522.20346-3-benjamin.tissoires@redhat.com> (raw)
In-Reply-To: <20171214132522.20346-1-benjamin.tissoires@redhat.com>
Before unregistering the led classes, we have to be sure there is no
more events in the input pipeline.
Closing the input node before removing the led classes flushes the
pipeline and this prevents segfaults.
Found with https://github.com/whot/fuzzydevice
Link: https://bugzilla.kernel.org/show_bug.cgi?id=197679
Cc: stable@vger.kernel.org
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---
drivers/input/input-leds.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/input/input-leds.c b/drivers/input/input-leds.c
index c86eb3d648bf..8aefcc186a02 100644
--- a/drivers/input/input-leds.c
+++ b/drivers/input/input-leds.c
@@ -211,6 +211,7 @@ static void input_leds_disconnect(struct input_handle *handle)
int i;
cancel_delayed_work_sync(&leds->init_work);
+ input_close_device(handle);
for (i = 0; i < leds->num_leds; i++) {
struct input_led *led = &leds->leds[i];
@@ -219,7 +220,6 @@ static void input_leds_disconnect(struct input_handle *handle)
kfree(led->cdev.name);
}
- input_close_device(handle);
input_unregister_handle(handle);
kfree(leds);
--
2.14.3
next prev parent reply other threads:[~2017-12-14 13:25 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-14 13:25 [PATCH 0/2] input - leds: fix bugs found by fuzzing Benjamin Tissoires
2017-12-14 13:25 ` [PATCH 1/2] input - leds: do not iterate over non initialized leds Benjamin Tissoires
2017-12-14 13:25 ` Benjamin Tissoires [this message]
2017-12-15 0:19 ` [PATCH 2/2] input - leds: fix input_led_disconnect path Samuel Thibault
2017-12-16 0:48 ` Dmitry Torokhov
2017-12-20 15:11 ` Benjamin Tissoires
2017-12-20 18:20 ` Dmitry Torokhov
2017-12-20 18:42 ` Benjamin Tissoires
2017-12-15 0:16 ` [PATCH 0/2] input - leds: fix bugs found by fuzzing Samuel Thibault
2017-12-15 8:04 ` Benjamin Tissoires
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=20171214132522.20346-3-benjamin.tissoires@redhat.com \
--to=benjamin.tissoires@redhat.com \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peter.hutterer@who-t.net \
--cc=samuel.thibault@ens-lyon.org \
--cc=stable@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).