diff --git a/ext/session/php_session.h b/ext/session/php_session.h index dfa7632e5a44..4f958bb8b82f 100644 --- a/ext/session/php_session.h +++ b/ext/session/php_session.h @@ -203,6 +203,7 @@ typedef struct _php_ps_globals { bool in_save_handler; /* state if session is in save handler or not */ bool set_handler; /* state if session module i setting handler or not */ zend_string *session_vars; /* serialized original session data */ + bool random_seeded; } php_ps_globals; typedef php_ps_globals zend_ps_globals; diff --git a/ext/session/session.c b/ext/session/session.c index 70e1673d87f5..ba71d709a536 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -394,6 +394,18 @@ static zend_long php_session_gc(bool immediate) /* {{{ */ /* GC must be done before reading session data. */ if ((PS(mod_data) || PS(mod_user_implemented))) { if (!collect && PS(gc_probability) > 0) { + /* Seed lazily on first GC draw per process. */ + if (UNEXPECTED(!PS(random_seeded))) { + php_random_uint128_t seed; + if (php_random_bytes_silent(&seed, sizeof(seed)) == FAILURE) { + seed = php_random_uint128_constant( + php_random_generate_fallback_seed(), + php_random_generate_fallback_seed() + ); + } + php_random_pcgoneseq128xslrr64_seed128(PS(random).state, seed); + PS(random_seeded) = true; + } collect = php_random_range(PS(random), 0, PS(gc_divisor) - 1) < PS(gc_probability); } @@ -2984,14 +2996,7 @@ static PHP_GINIT_FUNCTION(ps) /* {{{ */ .algo = &php_random_algo_pcgoneseq128xslrr64, .state = &ps_globals->random_state, }; - php_random_uint128_t seed; - if (php_random_bytes_silent(&seed, sizeof(seed)) == FAILURE) { - seed = php_random_uint128_constant( - php_random_generate_fallback_seed(), - php_random_generate_fallback_seed() - ); - } - php_random_pcgoneseq128xslrr64_seed128(ps_globals->random.state, seed); + ps_globals->random_seeded = false; } /* }}} */