lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

uml: DEBUG_SHIRQ fixes

Browse Source 
A couple more DEBUG_SHIRQ fixes.

The previous mconsole blocking fix exposed the lack of O_NONBLOCK on the
mconsole socket.

Also, winch_interrupt started crashing because it is called at irq free time
and it tries to dereference tty->driver_data, which has already been set to
NULL.

I added some error cleanup in mconsole_init while I was there.

Cc: "Karol Swietlicki" <magotari@gmail.com>
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jeff Dike
2008-02-04 22:31:19 -08:00
committed by Linus Torvalds
parent 83380cc1c9
commit 438ee6798c
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/um/drivers/line.c
View File

@@ -774,10 +774,12 @@ static irqreturn_t winch_interrupt(int irq, void *data)
tty = winch->tty; tty = winch->tty;
if (tty != NULL) { if (tty != NULL) {
line = tty->driver_data; line = tty->driver_data;
if (line != NULL) {
chan_window_size(&line->chan_list, &tty->winsize.ws_row, chan_window_size(&line->chan_list, &tty->winsize.ws_row,
&tty->winsize.ws_col); &tty->winsize.ws_col);
kill_pgrp(tty->pgrp, SIGWINCH, 1); kill_pgrp(tty->pgrp, SIGWINCH, 1);
} }
}
out: out:
if (winch->fd != -1) if (winch->fd != -1)
reactivate_fd(winch->fd, WINCH_IRQ); reactivate_fd(winch->fd, WINCH_IRQ);

8
arch/um/drivers/mconsole_kern.c
View File

@@ -792,6 +792,8 @@ static int __init mconsole_init(void)
printk(KERN_ERR "Failed to initialize management console\n"); printk(KERN_ERR "Failed to initialize management console\n");
return 1; return 1;
} }
if (os_set_fd_block(sock, 0))
goto out;
register_reboot_notifier(&reboot_notifier); register_reboot_notifier(&reboot_notifier);
@@ -800,7 +802,7 @@ static int __init mconsole_init(void)
"mconsole", (void *)sock); "mconsole", (void *)sock);
if (err) { if (err) {
printk(KERN_ERR "Failed to get IRQ for management console\n"); printk(KERN_ERR "Failed to get IRQ for management console\n");
return 1; goto out;
} }
if (notify_socket != NULL) { if (notify_socket != NULL) {
@@ -816,6 +818,10 @@ static int __init mconsole_init(void)
printk(KERN_INFO "mconsole (version %d) initialized on %s\n", printk(KERN_INFO "mconsole (version %d) initialized on %s\n",
MCONSOLE_VERSION, mconsole_socket_name); MCONSOLE_VERSION, mconsole_socket_name);
return 0; return 0;
out:
os_close_file(sock);
return 1;
} }
__initcall(mconsole_init); __initcall(mconsole_init);