Commit fb6717b60fb for php
commit fb6717b60fb30e540e68665f2cb0ddb9a9de5fca
Author: lacatoire <la.catoire@gmail.com>
Date: Thu Oct 1 19:06:43 2026 +0200
ext/pcntl: Fix pcntl_signal() fatal error for SIGKILL and SIGSTOP
pcntl_signal() on SIGKILL or SIGSTOP aborted the script with an
uncatchable E_ERROR raised by zend_sigaction(), because sigaction()
always fails for these signals. The SIG_ERR handling in pcntl_signal()
was never reached. Return false with the usual "Error assigning signal"
warning and EINVAL as last error instead.
The handler is validated before the SIGKILL and SIGSTOP check, so an
invalid handler still throws the TypeError or ValueError raised for
every other signal.
Close GH-25513
diff --git a/NEWS b/NEWS
index 5591f321bd0..8a5ab01ea1e 100644
--- a/NEWS
+++ b/NEWS
@@ -96,6 +96,10 @@ PHP NEWS
. Fixed stack buffer overflow with long connection user names, passwords,
charsets, or roles. (Ilia Alshanetsky)
+- PCNTL:
+ . Fixed pcntl_signal() raising a fatal error for SIGKILL and SIGSTOP.
+ (lacatoire)
+
- PCRE:
. Fixed \C being allowed in patterns enabling UTF mode with (*UTF) instead
of the u modifier. (Jorg Sowa)
diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
index 1858ee6e4a7..67b129a1509 100644
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
@@ -760,6 +760,25 @@ PHP_FUNCTION(pcntl_signal)
RETURN_THROWS();
}
+ if (Z_TYPE_P(handle) == IS_LONG) {
+ if (Z_LVAL_P(handle) != (zend_long) SIG_DFL && Z_LVAL_P(handle) != (zend_long) SIG_IGN) {
+ zend_argument_value_error(2, "must be either SIG_DFL or SIG_IGN when an integer value is given");
+ RETURN_THROWS();
+ }
+ } else if (!zend_is_callable_ex(handle, NULL, 0, NULL, NULL, NULL)) {
+ PCNTL_G(last_error) = EINVAL;
+
+ zend_argument_type_error(2, "must be of type callable|int, %s given", zend_zval_value_name(handle));
+ RETURN_THROWS();
+ }
+
+ /* sigaction() always fails for these, and zend_sigaction() turns that into a fatal error */
+ if (signo == SIGKILL || signo == SIGSTOP) {
+ PCNTL_G(last_error) = EINVAL;
+ php_error_docref(NULL, E_WARNING, "Error assigning signal");
+ RETURN_FALSE;
+ }
+
if (!PCNTL_G(spares)) {
/* since calling malloc() from within a signal handler is not portable,
* pre-allocate a few records for recording signals */
@@ -781,10 +800,6 @@ PHP_FUNCTION(pcntl_signal)
/* Special long value case for SIG_DFL and SIG_IGN */
if (Z_TYPE_P(handle) == IS_LONG) {
- if (Z_LVAL_P(handle) != (zend_long) SIG_DFL && Z_LVAL_P(handle) != (zend_long) SIG_IGN) {
- zend_argument_value_error(2, "must be either SIG_DFL or SIG_IGN when an integer value is given");
- RETURN_THROWS();
- }
if (php_signal(signo, (Sigfunc *) Z_LVAL_P(handle), (int) restart_syscalls) == (void *)SIG_ERR) {
PCNTL_G(last_error) = errno;
php_error_docref(NULL, E_WARNING, "Error assigning signal");
@@ -794,13 +809,6 @@ PHP_FUNCTION(pcntl_signal)
RETURN_TRUE;
}
- if (!zend_is_callable_ex(handle, NULL, 0, NULL, NULL, NULL)) {
- PCNTL_G(last_error) = EINVAL;
-
- zend_argument_type_error(2, "must be of type callable|int, %s given", zend_zval_value_name(handle));
- RETURN_THROWS();
- }
-
/* Register with the OS first so that on failure we don't record a handler that was never installed */
if (php_signal4(signo, pcntl_signal_handler, (int) restart_syscalls, 1) == (void *)SIG_ERR) {
PCNTL_G(last_error) = errno;
diff --git a/ext/pcntl/tests/pcntl_signal_sigkill_sigstop.phpt b/ext/pcntl/tests/pcntl_signal_sigkill_sigstop.phpt
new file mode 100644
index 00000000000..ab68bf799dc
--- /dev/null
+++ b/ext/pcntl/tests/pcntl_signal_sigkill_sigstop.phpt
@@ -0,0 +1,49 @@
+--TEST--
+pcntl_signal() returns false for SIGKILL and SIGSTOP
+--EXTENSIONS--
+pcntl
+--FILE--
+<?php
+foreach ([SIGKILL, SIGSTOP] as $signo) {
+ var_dump(pcntl_signal($signo, SIG_IGN));
+ var_dump(pcntl_signal($signo, SIG_DFL));
+ var_dump(pcntl_signal($signo, function () {}));
+ var_dump(pcntl_get_last_error() === PCNTL_EINVAL);
+}
+
+foreach ([SIGKILL, SIGSTOP] as $signo) {
+ foreach (['not_a_function', 42] as $handler) {
+ try {
+ var_dump(pcntl_signal($signo, $handler));
+ } catch (Throwable $e) {
+ echo $e::class, ': ', $e->getMessage(), "\n";
+ }
+ }
+}
+echo "alive\n";
+?>
+--EXPECTF--
+Warning: pcntl_signal(): Error assigning signal in %s on line %d
+bool(false)
+
+Warning: pcntl_signal(): Error assigning signal in %s on line %d
+bool(false)
+
+Warning: pcntl_signal(): Error assigning signal in %s on line %d
+bool(false)
+bool(true)
+
+Warning: pcntl_signal(): Error assigning signal in %s on line %d
+bool(false)
+
+Warning: pcntl_signal(): Error assigning signal in %s on line %d
+bool(false)
+
+Warning: pcntl_signal(): Error assigning signal in %s on line %d
+bool(false)
+bool(true)
+TypeError: pcntl_signal(): Argument #2 ($handler) must be of type callable|int, string given
+ValueError: pcntl_signal(): Argument #2 ($handler) must be either SIG_DFL or SIG_IGN when an integer value is given
+TypeError: pcntl_signal(): Argument #2 ($handler) must be of type callable|int, string given
+ValueError: pcntl_signal(): Argument #2 ($handler) must be either SIG_DFL or SIG_IGN when an integer value is given
+alive