src: forbid reset_handler for SIGSEGV handling

This is not easily implementable, and should be explicitly disallowed. PR-URL: #27775 Refs: #27246 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Rich Trott <[email protected]>
nodejs · Jun 14, 2019 · 89b3237 · 89b3237
1 parent e256204
commit 89b3237
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/node.cc b/src/node.cc
@@ -477,13 +477,15 @@ void LoadEnvironment(Environment* env) {
   USE(StartMainThreadExecution(env));
 }
 
+#ifdef __POSIX__
+typedef void (*sigaction_cb)(int signo, siginfo_t* info, void* ucontext);
+#endif
 #if NODE_USE_V8_WASM_TRAP_HANDLER
-static std::atomic<void (*)(int signo, siginfo_t* info, void* ucontext)>
-    previous_sigsegv_action;
+static std::atomic<sigaction_cb> previous_sigsegv_action;
 
 void TrapWebAssemblyOrContinue(int signo, siginfo_t* info, void* ucontext) {
   if (!v8::TryHandleWebAssemblyTrapPosix(signo, info, ucontext)) {
-    auto prev = previous_sigsegv_action.load();
+    sigaction_cb prev = previous_sigsegv_action.load();
     if (prev != nullptr) {
       prev(signo, info, ucontext);
     } else {
@@ -502,13 +504,13 @@ void TrapWebAssemblyOrContinue(int signo, siginfo_t* info, void* ucontext) {
 
 #ifdef __POSIX__
 void RegisterSignalHandler(int signal,
-                           void (*handler)(int signal,
-                                           siginfo_t* info,
-                                           void* ucontext),
+                           sigaction_cb handler,
                            bool reset_handler) {
+  CHECK_NOT_NULL(handler);
 #if NODE_USE_V8_WASM_TRAP_HANDLER
   if (signal == SIGSEGV) {
     CHECK(previous_sigsegv_action.is_lock_free());
+    CHECK(!reset_handler);
     previous_sigsegv_action.store(handler);
     return;
   }

diff --git a/src/node.h b/src/node.h
@@ -815,8 +815,12 @@ class NODE_EXTERN AsyncResource {
 };
 
 #ifndef _WIN32
-// Register a signal handler without interrupting
-// any handlers that node itself needs.
+// Register a signal handler without interrupting any handlers that node
+// itself needs. This does override handlers registered through
+// process.on('SIG...', function() { ... }). The `reset_handler` flag indicates
+// whether the signal handler for the given signal should be reset to its
+// default value before executing the handler (i.e. it works like SA_RESETHAND).
+// The `reset_handler` flag is invalid when `signal` is SIGSEGV.
 NODE_EXTERN
 void RegisterSignalHandler(int signal,
                            void (*handler)(int signal,