php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2'

Browse Source 
* PHP-8.2:
  Fix use of uninitialized memory in pcntl SIGCHLD handling
This commit is contained in:
Ilija Tovilo
2023-06-27 11:03:48 +02:00
parent 1358b435c6 7d188491c4
commit db2ac3a656
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ext/pcntl/pcntl.c
View File

@@ -1048,15 +1048,13 @@ static void pcntl_signal_handler(int signo, siginfo_t *siginfo, void *context)
static void pcntl_signal_handler(int signo)
#endif
{
struct php_pcntl_pending_signal *psig;
psig = PCNTL_G(spares);
if (!psig) {
struct php_pcntl_pending_signal *psig_first = PCNTL_G(spares);
if (!psig_first) {
/* oops, too many signals for us to track, so we'll forget about this one */
return;
}
struct php_pcntl_pending_signal *psig_first = psig;
struct php_pcntl_pending_signal *psig = NULL;
/* Standard signals may be merged into a single one.
* POSIX specifies that SIGCHLD has the si_pid field (https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/signal.h.html),
@@ -1075,13 +1073,14 @@ static void pcntl_signal_handler(int signo)
pid = waitpid(WAIT_ANY, &status, WNOHANG | WUNTRACED);
} while (pid <= 0 && errno == EINTR);
if (pid <= 0) {
if (UNEXPECTED(psig == psig_first)) {
/* Don't handle multiple, revert back to the single signal handling. */
goto single_signal;
if (UNEXPECTED(!psig)) {
/* The child might've been consumed by another thread and will be handled there. */
return;
}
break;
}
psig = psig ? psig->next : psig_first;
psig->signo = signo;
#ifdef HAVE_STRUCT_SIGINFO_T
@@ -1089,14 +1088,12 @@ static void pcntl_signal_handler(int signo)
psig->siginfo.si_pid = pid;
#endif
if (EXPECTED(psig->next)) {
psig = psig->next;
} else {
if (UNEXPECTED(!psig->next)) {
break;
}
}
} else {
single_signal:;
psig = psig_first;
psig->signo = signo;
#ifdef HAVE_STRUCT_SIGINFO_T

9
ext/pcntl/tests/gh11498.phpt
View File

@@ -14,10 +14,11 @@ $processes = [];
pcntl_async_signals(true);
pcntl_signal(SIGCHLD, function($sig, $info) use (&$processes) {
echo "SIGCHLD\n";
unset($processes[$info['pid']]);
}, false);
foreach (range(0, 5) as $i) {
for ($i = 0; $i <= 5; $i++) {
$process = proc_open('echo $$ > /dev/null', [], $pipes);
$pid = proc_get_status($process)['pid'];
$processes[$pid] = $process;
@@ -32,4 +33,10 @@ while (!empty($processes) && $iters > 0) {
var_dump(empty($processes));
?>
--EXPECT--
SIGCHLD
SIGCHLD
SIGCHLD
SIGCHLD
SIGCHLD
SIGCHLD
bool(true)