]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
Input: matrix_keypad - fix race when disabling interrupts
authorZhang Bo <zbsdta@126.com>
Mon, 5 Feb 2018 22:56:21 +0000 (14:56 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 18 Mar 2018 10:17:49 +0000 (11:17 +0100)
commit9bab71eb3fdea290835f5babc743f4914a631d51
tree818018ed476279a18abdd5d3262b729de5c4e2a1
parent175b57ba7da2d2b722b4d3bad67232be5f069d08
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: Zhang Bo <zbsdta@126.com>
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/input/keyboard/matrix_keypad.c