iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Input: matrix_keypad - fix race when disabling interrupts

Browse Source 
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: Zhang Bo <zbsdta@126.com>
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Zhang Bo 2018-02-05 14:56:21 -08:00 committed by Dmitry Torokhov
parent 0004520af3
commit ea4f7bd2ac
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/input/keyboard/matrix_keypad.c
View File

@ -218,8 +218,10 @@ static void matrix_keypad_stop(struct input_dev *dev)
{ {
struct matrix_keypad *keypad = input_get_drvdata(dev); struct matrix_keypad *keypad = input_get_drvdata(dev);
spin_lock_irq(&keypad->lock);
keypad->stopped = true; keypad->stopped = true;
mb(); spin_unlock_irq(&keypad->lock);
flush_work(&keypad->work.work); flush_work(&keypad->work.work);
/* /*
* matrix_keypad_scan() will leave IRQs enabled; * matrix_keypad_scan() will leave IRQs enabled;