Skip to content

Prevent late calls to zend_add_system_entropy() #20468

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Prevent late calls to zend_add_system_entropy() #20468

Show file tree
Hide file tree
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: 8 additions & 8 deletions Zend/zend_system_id.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ static int finalized = 0;

ZEND_API zend_result zend_add_system_entropy(const char *module_name, const char *hook_name, const void *data, size_t size)
{
if (finalized == 0) {
PHP_MD5Update(&context, module_name, strlen(module_name));
PHP_MD5Update(&context, hook_name, strlen(hook_name));
if (size) {
PHP_MD5Update(&context, data, size);
}
return SUCCESS;
ZEND_ASSERT(finalized == 0 && "zend_add_system_entropy() must not be called after zend_finalize_system_id()");

PHP_MD5Update(&context, module_name, strlen(module_name));
PHP_MD5Update(&context, hook_name, strlen(hook_name));
if (size) {
PHP_MD5Update(&context, data, size);
}
return FAILURE;

return SUCCESS;
}

#define ZEND_BIN_ID "BIN_" ZEND_TOSTR(SIZEOF_INT) ZEND_TOSTR(SIZEOF_LONG) ZEND_TOSTR(SIZEOF_SIZE_T) ZEND_TOSTR(SIZEOF_ZEND_LONG) ZEND_TOSTR(ZEND_MM_ALIGNMENT)
Expand Down
7 changes: 6 additions & 1 deletion ext/opcache/ZendAccelerator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3221,6 +3221,11 @@ static int accel_startup(zend_extension *extension)
orig_post_startup_cb = zend_post_startup_cb;
zend_post_startup_cb = accel_post_startup;

#ifdef HAVE_JIT
if (JIT_G(enabled)) {
zend_jit_startup();
}
#endif
/* Prevent unloading */
extension->handle = 0;

Expand Down Expand Up @@ -3327,7 +3332,7 @@ static zend_result accel_post_startup(void)
} else if (!ZSMMG(reserved)) {
zend_accel_error_noreturn(ACCEL_LOG_FATAL, "Could not enable JIT: could not use reserved buffer!");
} else {
zend_jit_startup(ZSMMG(reserved), jit_size, reattached);
zend_jit_post_startup(ZSMMG(reserved), jit_size, reattached);
zend_jit_startup_ok = true;
}
}
Expand Down
8 changes: 6 additions & 2 deletions ext/opcache/jit/zend_jit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3774,10 +3774,14 @@ int zend_jit_check_support(void)
return SUCCESS;
}

void zend_jit_startup(void *buf, size_t size, bool reattached)
void zend_jit_startup(void)
{
zend_jit_halt_op = zend_get_halt_op();
zend_jit_profile_counter_rid = zend_get_op_array_extension_handle(ACCELERATOR_PRODUCT_NAME);
}

void zend_jit_post_startup(void *buf, size_t size, bool reattached)
{
zend_jit_halt_op = zend_get_halt_op();

#ifdef HAVE_PTHREAD_JIT_WRITE_PROTECT_NP
zend_write_protect = pthread_jit_write_protect_supported_np();
Expand Down
3 changes: 2 additions & 1 deletion ext/opcache/jit/zend_jit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,8 @@ void zend_jit_init(void);
int zend_jit_config(zend_string *jit_options, int stage);
int zend_jit_debug_config(zend_long old_val, zend_long new_val, int stage);
int zend_jit_check_support(void);
void zend_jit_startup(void *jit_buffer, size_t size, bool reattached);
void zend_jit_startup(void);
void zend_jit_post_startup(void *jit_buffer, size_t size, bool reattached);
void zend_jit_shutdown(void);
void zend_jit_activate(void);
void zend_jit_deactivate(void);
Expand Down
Loading