Input: ff-memless - kill timer in destroy()

commit fa3a5a1 upstream.

No timer must be left running when the device goes away.

Signed-off-by: Oliver Neukum <[email protected]>
Reported-and-tested-by: [email protected]
Cc: [email protected]
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Dmitry Torokhov <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Orabug: 31213690
CVE: CVE-2019-19524
(cherry picked from commit 5edab14)
Signed-off-by: Dan Duval <[email protected]>
Reviewed-by:  John Donnelly <[email protected]>
Signed-off-by: Somasundaram Krishnasamy <[email protected]>

Author: oneukum

drivers/input/ff-memless.c

@@ -501,6 +501,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);
 }