From 2d385afd16ac818ff354a88f78062971a18a74e8 Mon Sep 17 00:00:00 2001 From: Sammy Powers Date: Fri, 10 Jul 2020 10:20:40 -0700 Subject: [PATCH] Include installed modules in accel_system_id generation Modules may have changed after restart which can cause dangling pointers from custom opcode handlers in the second-level cache files. This fixes this by including the installed module names and versions in the accel_system_id hash. For more details see: https://bugs.php.net/bug.php?id=79825 --- ext/opcache/ZendAccelerator.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index 073b3c8b5890..ebb2e4f33a5c 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -2730,6 +2730,9 @@ static void accel_gen_system_id(void) { PHP_MD5_CTX context; unsigned char digest[16]; + zend_module_entry *module; + zend_extension *extension; + zend_llist_position pos; PHP_MD5Init(&context); PHP_MD5Update(&context, PHP_VERSION, sizeof(PHP_VERSION)-1); @@ -2740,6 +2743,19 @@ static void accel_gen_system_id(void) PHP_MD5Update(&context, __DATE__, sizeof(__DATE__)-1); PHP_MD5Update(&context, __TIME__, sizeof(__TIME__)-1); } + /* Modules may have changed after restart which can cause dangling pointers from + * custom opcode handlers in the second-level cache files + */ + ZEND_HASH_FOREACH_PTR(&module_registry, module) { + PHP_MD5Update(&context, module->name, strlen(module->name)); + PHP_MD5Update(&context, module->version, strlen(module->version)); + } ZEND_HASH_FOREACH_END(); + extension = (zend_extension *) zend_llist_get_first_ex(&zend_extensions, &pos); + while (extension) { + PHP_MD5Update(&context, extension->name, strlen(extension->name)); + PHP_MD5Update(&context, extension->version, strlen(extension->version)); + extension = (zend_extension *) zend_llist_get_next_ex(&zend_extensions, &pos); + } PHP_MD5Final(digest, &context); php_hash_bin2hex(accel_system_id, digest, sizeof digest); }