diff options
| author | Richard Weinberger <richard@nod.at> | 2013-08-18 13:30:08 +0200 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2013-09-07 10:56:58 +0200 |
| commit | 91d44ff860a9e9c0db81a89cbc24fa31fbd8e6d3 (patch) | |
| tree | bb14601ab3afbcec3cb8d7d0f207d09cfc792268 /arch/um/drivers | |
| parent | bc1d72e73be63a7c4a07eb10cf51e91f20bf6076 (diff) | |
| download | talos-op-linux-91d44ff860a9e9c0db81a89cbc24fa31fbd8e6d3.tar.gz talos-op-linux-91d44ff860a9e9c0db81a89cbc24fa31fbd8e6d3.zip | |
um: Cleanup SIGTERM handling
Richard reported that some UML processes survive if the UML
main process receives a SIGTERM.
This issue was caused by a wrongly placed signal(SIGTERM, SIG_DFL)
in init_new_thread_signals().
It disabled the UML exit handler accidently for some processes.
The correct solution is to disable the fatal handler for all
UML helper threads/processes.
Such that last_ditch_exit() does not get called multiple times
and all processes can exit due to SIGTERM.
Reported-and-tested-by: Richard W.M. Jones <rjones@redhat.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/drivers')
| -rw-r--r-- | arch/um/drivers/ubd.h | 1 | ||||
| -rw-r--r-- | arch/um/drivers/ubd_kern.c | 3 | ||||
| -rw-r--r-- | arch/um/drivers/ubd_user.c | 5 |
3 files changed, 2 insertions, 7 deletions
diff --git a/arch/um/drivers/ubd.h b/arch/um/drivers/ubd.h index 3845051f1b10..3b48cd2081ee 100644 --- a/arch/um/drivers/ubd.h +++ b/arch/um/drivers/ubd.h @@ -7,7 +7,6 @@ #ifndef __UM_UBD_USER_H #define __UM_UBD_USER_H -extern void ignore_sigwinch_sig(void); extern int start_io_thread(unsigned long sp, int *fds_out); extern int io_thread(void *arg); extern int kernel_fd; diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c index 1812bc81715b..3716e6952554 100644 --- a/arch/um/drivers/ubd_kern.c +++ b/arch/um/drivers/ubd_kern.c @@ -1476,7 +1476,8 @@ int io_thread(void *arg) struct io_thread_req *req; int n; - ignore_sigwinch_sig(); + os_fix_helper_signals(); + while(1){ n = os_read_file(kernel_fd, &req, sizeof(struct io_thread_req *)); diff --git a/arch/um/drivers/ubd_user.c b/arch/um/drivers/ubd_user.c index a703e45d8aac..e376f9b9c68d 100644 --- a/arch/um/drivers/ubd_user.c +++ b/arch/um/drivers/ubd_user.c @@ -21,11 +21,6 @@ #include "ubd.h" #include <os.h> -void ignore_sigwinch_sig(void) -{ - signal(SIGWINCH, SIG_IGN); -} - int start_io_thread(unsigned long sp, int *fd_out) { int pid, fds[2], err; |
