diff options
| author | Oliver Neukum <oneukum@suse.com> | 2019-11-15 11:35:05 -0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2019-12-10 18:01:35 +0000 |
| commit | 8145f2181955c7c95f42a7f71b81ff91bc9e7b8c (patch) | |
| tree | 4f7a45b812c6cb0cf362a37bd9d8558a34f01b59 | |
| parent | 22cbb8fb12b3b5101260915162ad2b0b56a9284d (diff) | |
| download | linux-stable-8145f2181955c7c95f42a7f71b81ff91bc9e7b8c.tar.gz linux-stable-8145f2181955c7c95f42a7f71b81ff91bc9e7b8c.tar.bz2 linux-stable-8145f2181955c7c95f42a7f71b81ff91bc9e7b8c.zip | |
Input: ff-memless - kill timer in destroy()
commit fa3a5a1880c91bb92594ad42dfe9eedad7996b86 upstream.
No timer must be left running when the device goes away.
Signed-off-by: Oliver Neukum <oneukum@suse.com>
Reported-and-tested-by: syzbot+b6c55daa701fc389e286@syzkaller.appspotmail.com
Link: https://lore.kernel.org/r/1573726121.17351.3.camel@suse.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | drivers/input/ff-memless.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/input/ff-memless.c b/drivers/input/ff-memless.c index 74c0d8c6002a..eaeadc73cf5c 100644 --- a/drivers/input/ff-memless.c +++ b/drivers/input/ff-memless.c @@ -489,6 +489,15 @@ static void ml_ff_destroy(struct ff_device *ff) { struct ml_device *ml = ff->private; + /* + * Even though we stop all playing effects when tearing down + * an input device (via input_device_flush() that calls into + * input_ff_flush() that stops and erases all effects), we + * do not actually stop the timer, and therefore we should + * do it here. + */ + del_timer_sync(&ml->timer); + kfree(ml->private); } |