Fix unregistering ini entries of dynamically loaded extension #8435

arnaud-lb · 2022-04-24T11:39:29Z

This fixes a crash involving ZTS and dl().

In ZTS, the global registered_zend_ini_directives is copied to a thread-specific EG(ini_entries). Extensions loaded with dl() register their ini entries in EG(ini_entries), however they unregister them from registered_zend_ini_directives, which has no effect and leaves the entries in EG(ini_entries). This leads to problems when destroying EG(ini_entries) later, because it references resources that are already freed.

This change ensures that MODULE_TEMPORARY modules will unregister their entries from EG(ini_entries).

I added a test extension specifically for the purpose of testing dl(). I could have used the zend_test for that, but I felt that with a dedicated extension it would be harder to accidentally nerf/no-op the tests.

cmb69 · 2022-04-27T12:56:20Z

This is supposed to fix #8185, I think.

ext/standard/tests/general_functions/dl-001.phpt

cmb69

Thank you for the PR! Before more detailed review, we need to clarify whether this constitutes an ABI break (if so, we cannot target any of the stable PHP versions).

Zend/zend_ini.h

cmb69

Overall, this looks good to me, but I left some style nits.

cmb69 · 2022-05-04T10:42:21Z

ext/dl_test/.gitignore

@@ -0,0 +1,41 @@
+*.lo


Do we really need this file? Isn't that already handled by .gitignore in the root?

cmb69 · 2022-05-04T10:43:00Z

ext/dl_test/dl_test.c

+  | obtain it through the world-wide-web, please send a note to          |
+  | [email protected] so we can mail you a copy immediately.               |
+  +----------------------------------------------------------------------+
+  | Author:                                                              |


I think you should add yourself as author.

cmb69 · 2022-05-04T10:46:09Z

ext/dl_test/php_dl_test.h

+extern zend_module_entry dl_test_module_entry;
+# define phpext_dl_test_ptr &dl_test_module_entry
+
+# define PHP_DL_TEST_VERSION "0.1.0"


I don't see the point in having an own version for a bundled extension; consider to use PHP_VERSION instead of some hard-coded value.

cmb69 · 2022-05-04T10:47:28Z

ext/dl_test/tests/skip.inc

+// Check that the dl_test extension is built. We don't use the --EXTENSIONS--
+// section because we want to load the extension with dl().
+
+if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {


I prefer

Suggested change

if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {

if (PHP_OS_FAMILY === 'Windows') {

cmb69 · 2022-05-04T10:48:19Z

ext/dl_test/tests/skip.inc

+if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+    $path = ini_get('extension_dir') . DIRECTORY_SEPARATOR . 'php_dl_test.dll';
+} else {
+    $path = ini_get('extension_dir') . DIRECTORY_SEPARATOR . 'dl_test.so';


Do we have to cater to macOS which uses .dylib as far as I know?

I checked because I was not sure. The PHP build appears to generate .so files. The CI looks ok too (no mention of skipping or failing these tests).

cmb69 · 2022-05-04T10:49:29Z

ext/standard/tests/general_functions/dl-001.phpt

+--TEST--
+dl(): Loaded extensions properly unregister their ini settings
+--SKIPIF--
+<?php include __DIR__ . "/../../../dl_test/tests/skip.inc";


I very much prefer to explicitly have the closing PHP tags in .phpt files, so that syntax highlighting works.

Aren't they also required for another reason? But yes I agree adding the closing tags is better

No. The sections containing PHP code are extracted to temporary files, so closing tags are not strictly needed.

For me personally it's because I like to be able to run tests quickly without invoking run-tests, by just doing php thetest.phpt

Girgias

Other than the PHPT test changes LGTM

Girgias · 2022-04-29T22:07:28Z

ext/standard/tests/general_functions/dl-001.phpt

+--TEST--
+dl(): Loaded extensions properly unregister their ini settings
+--SKIPIF--
+<?php include __DIR__ . "/../../../dl_test/tests/skip.inc";


Suggested change

<?php include __DIR__ . "/../../../dl_test/tests/skip.inc";

<?php include dirname(__DIR__, 3) . "/dl_test/tests/skip.inc";

Might be 2, not sure of the top of my head.

Girgias · 2022-05-05T10:58:57Z

ext/standard/tests/general_functions/dl-001.phpt

+--TEST--
+dl(): Loaded extensions properly unregister their ini settings
+--SKIPIF--
+<?php include __DIR__ . "/../../../dl_test/tests/skip.inc";


Aren't they also required for another reason? But yes I agree adding the closing tags is better

bukka · 2023-10-06T12:58:52Z

Zend/zend_ini.c

@@ -210,7 +211,10 @@ ZEND_API zend_result zend_register_ini_entries(const zend_ini_entry_def *ini_ent
 	 * lead to death.
 	 */
 	if (directives != EG(ini_directives)) {
+		ZEND_ASSERT(module_type == MODULE_TEMPORARY);


@arnaud-lb just stumbled on this when fixing FPM extension loading using php_admin_value[extension] . It actaully uses php_dl and initializes permanent module so this is actually not going to work so I had to remove this assertion in #12277 . FPM is single threaded so it should not impact this issue - it just really needs to remove the assertion.

There might be potentially other issues with using dl for permanent modules and it has got some limitation but think the whole concept of using php_dl in FPM is really problematic which will require some bigger changes in FPM to get it rif of it (introduction of pool manager).

Anyway if you see some bigger problem with my change, please comment on that PR.

arnaud-lb force-pushed the issue-8185 branch 2 times, most recently from 4e62576 to 31c303f Compare April 24, 2022 12:06

arnaud-lb changed the base branch from master to PHP-8.1 April 24, 2022 12:06

Girgias reviewed Apr 27, 2022

View reviewed changes

ext/standard/tests/general_functions/dl-001.phpt Outdated Show resolved Hide resolved

arnaud-lb force-pushed the issue-8185 branch 4 times, most recently from e9c08ee to 45c10f5 Compare April 29, 2022 20:54

arnaud-lb marked this pull request as ready for review April 29, 2022 21:54

arnaud-lb requested review from cmb69 and Girgias April 29, 2022 21:54

arnaud-lb added the Waiting on Review label Apr 29, 2022

arnaud-lb mentioned this pull request Apr 30, 2022

pear install: error in malloc_consolidate #8185

Closed

cmb69 reviewed May 3, 2022

View reviewed changes

Zend/zend_ini.h Outdated Show resolved Hide resolved

arnaud-lb force-pushed the issue-8185 branch from 45c10f5 to 478ea97 Compare May 3, 2022 16:43

cmb69 reviewed May 4, 2022

View reviewed changes

Girgias approved these changes May 5, 2022

View reviewed changes

Fix unregistering ini entries of dynamically loaded extension

23e2b78

arnaud-lb force-pushed the issue-8185 branch from 478ea97 to 23e2b78 Compare May 6, 2022 08:36

arnaud-lb merged commit f07a08d into php:PHP-8.1 May 6, 2022

arnaud-lb mentioned this pull request May 6, 2022

Use zend_register_ini_entries_ex / zend_unregister_ini_entries_ex #8505

Merged

arnaud-lb removed the Waiting on Review label May 6, 2022

tsegarra mentioned this pull request Sep 28, 2022

PHP8.1 compatibility krakjoe/tombs#20

Open

bukka reviewed Oct 6, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix unregistering ini entries of dynamically loaded extension #8435

Fix unregistering ini entries of dynamically loaded extension #8435

arnaud-lb commented Apr 24, 2022 •

edited

Loading

cmb69 commented Apr 27, 2022

cmb69 left a comment

cmb69 left a comment

cmb69 May 4, 2022

cmb69 May 4, 2022

cmb69 May 4, 2022

cmb69 May 4, 2022

cmb69 May 4, 2022

arnaud-lb May 6, 2022

cmb69 May 4, 2022

Girgias May 5, 2022

cmb69 May 5, 2022

bwoebi May 5, 2022

Girgias left a comment

Girgias Apr 29, 2022

Girgias May 5, 2022

bukka Oct 6, 2023 •

edited

Loading

	if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
	if (PHP_OS_FAMILY === 'Windows') {

	<?php include __DIR__ . "/../../../dl_test/tests/skip.inc";
	<?php include dirname(__DIR__, 3) . "/dl_test/tests/skip.inc";

Fix unregistering ini entries of dynamically loaded extension #8435

Fix unregistering ini entries of dynamically loaded extension #8435

Conversation

arnaud-lb commented Apr 24, 2022 • edited Loading

cmb69 commented Apr 27, 2022

cmb69 left a comment

Choose a reason for hiding this comment

cmb69 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Girgias left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bukka Oct 6, 2023 • edited Loading

Choose a reason for hiding this comment

arnaud-lb commented Apr 24, 2022 •

edited

Loading

bukka Oct 6, 2023 •

edited

Loading