Skip to content
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

Jump to bottom

Fix GH-9067: random extension is not thread safe #9070

Closed
wants to merge 2 commits into from
Closed

Fix GH-9067: random extension is not thread safe #9070

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc6eaf0
Fix GH-9067: random extension is not thread safe
cmb69 Jul 20, 2022
1e07c12
Remove dead code
cmb69 Jul 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
65 changes: 32 additions & 33 deletions ext/random/random.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,6 +776,35 @@ PHP_FUNCTION(random_int)
}
/* }}} */

/* {{{ PHP_GINIT_FUNCTION */
static PHP_GINIT_FUNCTION(random)
{
random_globals->random_fd = -1;

random_globals->combined_lcg = php_random_status_alloc(&php_random_algo_combinedlcg, true);
random_globals->combined_lcg_seeded = false;

random_globals->mt19937 = php_random_status_alloc(&php_random_algo_mt19937, true);
random_globals->mt19937_seeded = false;
}
/* }}} */

/* {{{ PHP_GSHUTDOWN_FUNCTION */
static PHP_GSHUTDOWN_FUNCTION(random)
{
if (random_globals->random_fd > 0) {
close(random_globals->random_fd);
random_globals->random_fd = -1;
}

php_random_status_free(random_globals->combined_lcg, true);
random_globals->combined_lcg = NULL;

php_random_status_free(random_globals->mt19937, true);
random_globals->mt19937 = NULL;
}
/* }}} */

/* {{{ PHP_MINIT_FUNCTION */
PHP_MINIT_FUNCTION(random)
{
Expand Down Expand Up @@ -828,43 +857,13 @@ PHP_MINIT_FUNCTION(random)
REGISTER_LONG_CONSTANT("MT_RAND_MT19937", MT_RAND_MT19937, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MT_RAND_PHP", MT_RAND_PHP, CONST_CS | CONST_PERSISTENT);

RANDOM_G(random_fd) = -1;

RANDOM_G(combined_lcg) = php_random_status_alloc(&php_random_algo_combinedlcg, true);
RANDOM_G(combined_lcg_seeded) = false;

RANDOM_G(mt19937) = php_random_status_alloc(&php_random_algo_mt19937, true);
RANDOM_G(mt19937_seeded) = false;

return SUCCESS;
}
/* }}} */

/* {{{ PHP_MSHUTDOWN_FUNCTION */
PHP_MSHUTDOWN_FUNCTION(random)
{
if (RANDOM_G(random_fd) > 0) {
close(RANDOM_G(random_fd));
RANDOM_G(random_fd) = -1;
}

php_random_status_free(RANDOM_G(combined_lcg), true);
RANDOM_G(combined_lcg) = NULL;

php_random_status_free(RANDOM_G(mt19937), true);
RANDOM_G(mt19937) = NULL;

return SUCCESS;
}
/* }}} */

/* {{{ PHP_RINIT_FUNCTION */
PHP_RINIT_FUNCTION(random)
{
#if defined(ZTS) && defined(COMPILE_DL_RANDOM)
ZEND_TSRMLS_CACHE_UPDATE();
#endif

RANDOM_G(combined_lcg_seeded) = false;
RANDOM_G(mt19937_seeded) = false;

Expand All @@ -878,14 +877,14 @@ zend_module_entry random_module_entry = {
"random", /* Extension name */
ext_functions, /* zend_function_entry */
PHP_MINIT(random), /* PHP_MINIT - Module initialization */
PHP_MSHUTDOWN(random), /* PHP_MSHUTDOWN - Module shutdown */
NULL, /* PHP_MSHUTDOWN - Module shutdown */
PHP_RINIT(random), /* PHP_RINIT - Request initialization */
NULL, /* PHP_RSHUTDOWN - Request shutdown */
NULL, /* PHP_MINFO - Module info */
PHP_VERSION, /* Version */
PHP_MODULE_GLOBALS(random), /* ZTS Module globals */
NULL, /* PHP_GINIT - Global initialization */
NULL, /* PHP_GSHUTDOWN - Global shutdown */
PHP_GINIT(random), /* PHP_GINIT - Global initialization */
PHP_GSHUTDOWN(random), /* PHP_GSHUTDOWN - Global shutdown */
NULL, /* Post deactivate */
STANDARD_MODULE_PROPERTIES_EX
};
Expand Down