[PATCH] tty/hvc_console: fix console lock ordering with spinlock

From	Denis Kirjanov <kda@linux-powerpc.org>
Newsgroups	linux.kernel
Subject	[PATCH] tty/hvc_console: fix console lock ordering with spinlock
Date	2017-03-30 16:10 +0200
Message-ID	<tqIVY-7qR-27@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

hvc_remove() takes a spin lock first then acquires the console
semaphore. This situation can easily lead to a deadlock scenario
where we call scheduler with spin lock held.

Signed-off-by: Denis Kirjanov <kda@linux-powerpc.org>
---
 drivers/tty/hvc/hvc_console.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
index b19ae36..a8d3991 100644
--- a/drivers/tty/hvc/hvc_console.c
+++ b/drivers/tty/hvc/hvc_console.c
@@ -920,17 +920,17 @@ int hvc_remove(struct hvc_struct *hp)
 
 	tty = tty_port_tty_get(&hp->port);
 
+	console_lock();
 	spin_lock_irqsave(&hp->lock, flags);
 	if (hp->index < MAX_NR_HVC_CONSOLES) {
-		console_lock();
 		vtermnos[hp->index] = -1;
 		cons_ops[hp->index] = NULL;
-		console_unlock();
 	}
 
 	/* Don't whack hp->irq because tty_hangup() will need to free the irq. */
 
 	spin_unlock_irqrestore(&hp->lock, flags);
+	console_unlock();
 
 	/*
 	 * We 'put' the instance that was grabbed when the kref instance
-- 
1.8.3.1

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] tty/hvc_console: fix console lock ordering with spinlock Denis Kirjanov <kda@linux-powerpc.org> - 2017-03-30 16:10 +0200
  Re: [PATCH] tty/hvc_console: fix console lock ordering with spinlock Denis Kirjanov <kda@linux-powerpc.org> - 2017-04-04 15:00 +0200

csiph-web