Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8995b894 authored by Zhang Bo's avatar Zhang Bo Committed by Greg Kroah-Hartman
Browse files

Input: matrix_keypad - fix race when disabling interrupts 



commit ea4f7bd2aca9f68470e9aac0fc9432fd180b1fe7 upstream.

If matrix_keypad_stop() is executing and the keypad interrupt is triggered,
disable_row_irqs() may be called by both matrix_keypad_interrupt() and
matrix_keypad_stop() at the same time, causing interrupts to be disabled
twice and the keypad being "stuck" after resuming.

Take lock when setting keypad->stopped to ensure that ISR will not race
with matrix_keypad_stop() disabling interrupts.

Signed-off-by: default avatarZhang Bo <zbsdta@126.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dd9c6a78

drivers/input/keyboard/matrix_keypad.c

+3 −1
Original line number Diff line number Diff line
@@ -216,8 +216,10 @@ static void matrix_keypad_stop(struct input_dev *dev) 
{

	struct matrix_keypad *keypad = input_get_drvdata(dev);



	spin_lock_irq(&keypad->lock);

	keypad->stopped = true;

	mb();

	spin_unlock_irq(&keypad->lock);



	flush_work(&keypad->work.work);

	/*

	 * matrix_keypad_scan() will leave IRQs enabled;