Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 06ae750

Browse files
committed
Fix GH-8789 and GH-10015: Fix ZTS zend signal crashes due to NULL globals
Fixes GH-8789. Fixes GH-10015. This is one small part of the underlying bug for GH-10737, as in my attempts to reproduce the issue I constantly hit this crash easily. (The fix for the other underlying issue for that bug will follow soon.) It's possible that a signal arrives at a thread that never handled a PHP request before. This causes the signal globals to dereference a NULL pointer because the TSRM pointers for the thread aren't set up to point to the thread resources yet. PR GH-9766 previously fixed this for master by ignoring the signal if the thread didn't handle a PHP request yet. While this fixes the crash bug, I think the solution is suboptimal for 3 reasons: 1) The signal is ignored and a message is printed saying there is a bug. However, this is not a bug at all. For example in Apache, the signal set up happens on child process creation, and the thread resource creation happens lazily when the first request is handled by the thread. Hence, the fact that the thread resources aren't set up yet is not actually buggy behaviour. 2) I believe since it was believed to be buggy behaviour, that fix was only applied to master, so 8.1 & 8.2 keep on crashing. 3) We can do better than ignoring the signal. By just acting in the same way as if the signals aren't active. This means we need to take the same path as if the TSRM had already shut down. Closes GH-10861.
1 parent 5adeed3 commit 06ae750

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

‎NEWS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ PHP NEWS
99
. Fixed bug GH-8646 (Memory leak PHP FPM 8.1). (nielsdos)
1010
. Fixed bug GH-10801 (Named arguments in CTE functions cause a segfault).
1111
(nielsdos)
12+
. Fixed bug GH-8789 (PHP 8.0.20 (ZTS) zend_signal_handler_defer crashes on
13+
apache). (nielsdos)
14+
. Fixed bug GH-10015 (zend_signal_handler_defer crashes on apache shutdown).
15+
(nielsdos)
1216

1317
- FPM:
1418
. Fixed bug GH-10611 (fpm_env_init_main leaks environ). (nielsdos)

‎Zend/zend_signal.c‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,10 @@ void zend_signal_handler_defer(int signo, siginfo_t *siginfo, void *context)
8585
zend_signal_queue_t *queue, *qtmp;
8686

8787
#ifdef ZTS
88-
/* A signal could hit after TSRM shutdown, in this case globals are already freed. */
89-
if (tsrm_is_shutdown()) {
88+
/* A signal could hit after TSRM shutdown, in this case globals are already freed.
89+
* Or it could be delivered to a thread that didn't execute PHP yet.
90+
* In the latter case we act as if SIGG(active) is false. */
91+
if (tsrm_is_shutdown() || !tsrm_get_ls_cache()) {
9092
/* Forward to default handler handler */
9193
zend_signal_handler(signo, siginfo, context);
9294
return;
@@ -178,7 +180,7 @@ static void zend_signal_handler(int signo, siginfo_t *siginfo, void *context)
178180
sigset_t sigset;
179181
zend_signal_entry_t p_sig;
180182
#ifdef ZTS
181-
if (tsrm_is_shutdown()) {
183+
if (tsrm_is_shutdown()|| !tsrm_get_ls_cache()) {
182184
p_sig.flags = 0;
183185
p_sig.handler = SIG_DFL;
184186
} else

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /