Commit c9ddb1d6 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman

XTENSA: iss/console, fix potential deadlock

If the timer ticks while we are holding the spinlock, the system
deadlocks. It is due to synchronous del_timer.

So to fix that, use spinlocks that properly disable bottom halves.
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Chris Zankel <chris@zankel.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 86e7e874
......@@ -91,11 +91,10 @@ static int rs_open(struct tty_struct *tty, struct file * filp)
*/
static void rs_close(struct tty_struct *tty, struct file * filp)
{
spin_lock(&timer_lock);
spin_lock_bh(&timer_lock);
if (tty->count == 1)
/* this will cause a deadlock if the timer ticks right now */
del_timer_sync(&serial_timer);
spin_unlock(&timer_lock);
spin_unlock_bh(&timer_lock);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment