Skip to content

fix: avoid longjmp crash on ARM64/macOS when connection is aborted #2304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
johanjanssens wants to merge 1 commit into from
+14 −2
Closed

fix: avoid longjmp crash on ARM64/macOS when connection is aborted #2304

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions frankenphp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,18 @@ static size_t frankenphp_ub_write(const char *str, size_t str_length) {
go_ub_write(thread_index, (char *)str, str_length);

if (result.r1) {
php_handle_aborted_connection();
/*
* Inline the effect of php_handle_aborted_connection() without calling
* zend_bailout(). On ARM64/macOS, zend_bailout() triggers longjmp()
* which crashes due to PAC (Pointer Authentication) verification failure
* on the jmp_buf — the buffer was signed in a different stack frame.
*
* This matches Nginx Unit's approach (nxt_php_sapi.c): set the
* connection status and disable output, letting PHP detect the abort
* at safe points (e.g. between opcodes via zend_interrupt checks).
*/
PG(connection_status) = PHP_CONNECTION_ABORTED;
php_output_set_status(PHP_OUTPUT_DISABLED);
}

return result.r0;
Expand Down Expand Up @@ -777,7 +788,8 @@ static int frankenphp_send_headers(sapi_headers_struct *sapi_headers) {
static void frankenphp_sapi_flush(void *server_context) {
sapi_send_headers();
if (go_sapi_flush(thread_index)) {
php_handle_aborted_connection();
PG(connection_status) = PHP_CONNECTION_ABORTED;
php_output_set_status(PHP_OUTPUT_DISABLED);
}
}

Expand Down
Loading