Messages in this thread Patch in this message | | | Subject | [PATCH 12/19] UML - Fix exitcall ordering bug | Date | Thu, 06 Jul 2006 20:33:47 -0400 | From | Jeff Dike <> |
| |
This fixes an exitcall ordering bug - calls to ignore_sigio_fd can come from exitcalls that come after the sigio thread has been killed. This would cause shutdown to hang or crash.
Fixed by having ignore_sigio_fd check that the thread is present before trying to communicate with it.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Index: linux-2.6.17/arch/um/os-Linux/sigio.c =================================================================== --- linux-2.6.17.orig/arch/um/os-Linux/sigio.c 2006-07-06 13:44:26.000000000 -0400 +++ linux-2.6.17/arch/um/os-Linux/sigio.c 2006-07-06 14:46:10.000000000 -0400 @@ -191,6 +191,13 @@ int ignore_sigio_fd(int fd) struct pollfd *p; int err = 0, i, n = 0; + /* This is called from exitcalls elsewhere in UML - if + * sigio_cleanup has already run, then update_thread will hang + * or fail because the thread is no longer running. + */ + if(write_sigio_pid == -1) + return -EIO; + sigio_lock(); for(i = 0; i < current_poll.used; i++){ if(current_poll.poll[i].fd == fd) break; @@ -215,7 +222,7 @@ int ignore_sigio_fd(int fd) update_thread(); out: sigio_unlock(); - return(err); + return err; } static struct pollfd *setup_initial_poll(int fd) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |