protect uv_spawn from signals (fix timholy/IProfile.jl#16)

(cherry picked from commit 6c86f09)
musm · Jun 10, 2019 · c4ad8c2 · c4ad8c2
1 parent abcf8e5
commit c4ad8c2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/unix/linux-core.c b/src/unix/linux-core.c
@@ -250,7 +250,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
      */
     if (epoll_ctl(loop->backend_fd, op, w->fd, &e)) {
       if (errno == EPERM) { /* fd is probably a file, which is always ready */
-        w->cb(loop, w, UV__EPOLLIN | UV__EPOLLOUT);
+        w->cb(loop, w, POLLIN | POLLOUT);
         timeout = 0; /* fd is now likely closed and needs to return to the uv_run loop for cleanup */
       } else if (errno != EEXIST) {
         abort();

diff --git a/src/unix/process.c b/src/unix/process.c
@@ -33,6 +33,7 @@
 #include <fcntl.h>
 #include <poll.h>
 #include <sched.h>
+#include <signal.h>
 
 #if defined(__APPLE__) && !TARGET_OS_IPHONE
 # include <crt_externs.h>
@@ -391,6 +392,8 @@ int uv_spawn(uv_loop_t* loop,
   int exec_errorno;
   int i;
   int status;
+  sigset_t sigset;
+  sigset_t sigoset;
 
   if (options->cpumask != NULL) {
 #if defined(__linux__) || defined(__FreeBSD__)
@@ -463,8 +466,12 @@ int uv_spawn(uv_loop_t* loop,
 
   uv_signal_start(&loop->child_watcher, uv__chld, SIGCHLD);
 
+  sigfillset(&sigset);
+  sigprocmask(SIG_SETMASK, &sigset, &sigoset);
+
   /* Acquire write lock to prevent opening new fds in worker threads */
   uv_rwlock_wrlock(&loop->cloexec_lock);
+
   pid = fork();
 
   if (pid == -1) {
@@ -476,6 +483,7 @@ int uv_spawn(uv_loop_t* loop,
   }
 
   if (pid == 0) {
+    sigprocmask(SIG_SETMASK, &sigoset, NULL);
     uv__process_child_init(options, stdio_count, pipes, signal_pipe[1]);
     abort();
   }
@@ -529,7 +537,7 @@ int uv_spawn(uv_loop_t* loop,
 
   if (pipes != pipes_storage)
     uv__free(pipes);
-
+  sigprocmask(SIG_SETMASK, &sigoset, NULL);
   return exec_errorno;
 
 error:
@@ -548,6 +556,8 @@ int uv_spawn(uv_loop_t* loop,
       uv__free(pipes);
   }
 
+  sigprocmask(SIG_SETMASK, &sigoset, NULL);
+
   return err;
 #endif
 }