UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

vt: fix vc_resize locking 

Lockdep says we can't take tasklist lock or sighand lock inside ctrl_lock.

Signed-off-by: Nick Piggin <npiggin@suse.de>
Acked-by: Alan Cox <alan@redhat.com>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Nick Piggin 2008-06-05 22:46:38 -07:00 committed by Linus Torvalds
parent dfcceb26f8
commit 81c6ce9bd3
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/char/vt.c
View File

@ -909,7 +909,7 @@ int vc_resize(struct vc_data *vc, unsigned int cols, unsigned int lines)
if (vc->vc_tty) { if (vc->vc_tty) {
struct winsize ws, *cws = &vc->vc_tty->winsize; struct winsize ws, *cws = &vc->vc_tty->winsize;
unsigned long flags; struct pid *pgrp = NULL;
memset(&ws, 0, sizeof(ws)); memset(&ws, 0, sizeof(ws));
ws.ws_row = vc->vc_rows; ws.ws_row = vc->vc_rows;
@ -917,11 +917,14 @@ int vc_resize(struct vc_data *vc, unsigned int cols, unsigned int lines)
ws.ws_ypixel = vc->vc_scan_lines; ws.ws_ypixel = vc->vc_scan_lines;
mutex_lock(&vc->vc_tty->termios_mutex); mutex_lock(&vc->vc_tty->termios_mutex);
spin_lock_irqsave(&vc->vc_tty->ctrl_lock, flags); spin_lock_irq(&vc->vc_tty->ctrl_lock);
if ((ws.ws_row != cws->ws_row || ws.ws_col != cws->ws_col) && if ((ws.ws_row != cws->ws_row || ws.ws_col != cws->ws_col))
vc->vc_tty->pgrp) pgrp = get_pid(vc->vc_tty->pgrp);
spin_unlock_irq(&vc->vc_tty->ctrl_lock);
if (pgrp) {
kill_pgrp(vc->vc_tty->pgrp, SIGWINCH, 1); kill_pgrp(vc->vc_tty->pgrp, SIGWINCH, 1);
spin_unlock_irqrestore(&vc->vc_tty->ctrl_lock, flags); put_pid(pgrp);
}
*cws = ws; *cws = ws;
mutex_unlock(&vc->vc_tty->termios_mutex); mutex_unlock(&vc->vc_tty->termios_mutex);
} }