From: Oliver Neukum Date: Fri, 15 Nov 2019 19:35:05 +0000 (-0800) Subject: Input: ff-memless - kill timer in destroy() X-Git-Tag: v3.16.79~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8145f2181955c7c95f42a7f71b81ff91bc9e7b8c;p=thirdparty%2Fkernel%2Fstable.git 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 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 Signed-off-by: Ben Hutchings --- diff --git a/drivers/input/ff-memless.c b/drivers/input/ff-memless.c index 74c0d8c6002ac..eaeadc73cf5c8 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); }