Skip to content

Fix GH-19520: php_admin_value[extension] in FPM unsafely runs RINIT #20636

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
+15 −10
Draft

Fix GH-19520: php_admin_value[extension] in FPM unsafely runs RINIT #20636

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
13 changes: 7 additions & 6 deletions ext/standard/dl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ PHPAPI PHP_FUNCTION(dl)
zend_rc_debug = false;
#endif

php_dl(filename, MODULE_TEMPORARY, return_value, 0);
php_dl(filename, MODULE_TEMPORARY, return_value, PHP_DL_START_NONE);
if (Z_TYPE_P(return_value) == IS_TRUE) {
EG(full_tables_cleanup) = 1;
}
Expand Down Expand Up @@ -107,7 +107,7 @@ PHPAPI void *php_load_shlib(const char *path, char **errp)
/* }}} */

/* {{{ php_load_extension */
PHPAPI int php_load_extension(const char *filename, int type, int start_now)
PHPAPI int php_load_extension(const char *filename, int type, int start_mode)
{
void *handle;
char *libpath;
Expand Down Expand Up @@ -238,12 +238,13 @@ PHPAPI int php_load_extension(const char *filename, int type, int start_now)

module_entry->handle = handle;

if ((type == MODULE_TEMPORARY || start_now) && zend_startup_module_ex(module_entry) == FAILURE) {
if ((type == MODULE_TEMPORARY || start_mode == PHP_DL_START_MODULE || start_mode == PHP_DL_START_REQUEST) &&
zend_startup_module_ex(module_entry) == FAILURE) {
DL_UNLOAD(handle);
return FAILURE;
}

if ((type == MODULE_TEMPORARY || start_now) && module_entry->request_startup_func) {
if ((type == MODULE_TEMPORARY || (start_mode == PHP_DL_START_REQUEST)) && module_entry->request_startup_func) {
if (module_entry->request_startup_func(type, module_entry->module_number) == FAILURE) {
php_error_docref(NULL, error_type, "Unable to initialize module '%s'", module_entry->name);
DL_UNLOAD(handle);
Expand Down Expand Up @@ -278,10 +279,10 @@ PHPAPI int php_load_extension(const char *filename, int type, int start_now)
#endif

/* {{{ php_dl */
PHPAPI void php_dl(const char *file, int type, zval *return_value, int start_now)
PHPAPI void php_dl(const char *file, int type, zval *return_value, int start_mode)
{
/* Load extension */
if (php_load_extension(file, type, start_now) == FAILURE) {
if (php_load_extension(file, type, start_mode) == FAILURE) {
RETVAL_FALSE;
} else {
RETVAL_TRUE;
Expand Down
8 changes: 6 additions & 2 deletions ext/standard/dl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,12 @@
#ifndef DL_H
#define DL_H

PHPAPI int php_load_extension(const char *filename, int type, int start_now);
PHPAPI void php_dl(const char *file, int type, zval *return_value, int start_now);
#define PHP_DL_START_NONE 0
#define PHP_DL_START_REQUEST 1
#define PHP_DL_START_MODULE 2

PHPAPI int php_load_extension(const char *filename, int type, int start_mode);
PHPAPI void php_dl(const char *file, int type, zval *return_value, int start_mode);
PHPAPI void *php_load_shlib(const char *path, char **errp);

/* dynamic loading functions */
Expand Down
2 changes: 1 addition & 1 deletion main/php_ini.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ static void php_ini_parser_cb(zval *arg1, zval *arg2, zval *arg3, int callback_t
static void php_load_php_extension_cb(void *arg)
{
#ifdef HAVE_LIBDL
php_load_extension(*((char **) arg), MODULE_PERSISTENT, 0);
php_load_extension(*((char **) arg), MODULE_PERSISTENT, PHP_DL_START_NONE);
#endif
}
/* }}} */
Expand Down
2 changes: 1 addition & 1 deletion sapi/fpm/fpm/fpm_php.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ int fpm_php_apply_defines_ex(struct key_value_s *kv, int mode) /* {{{ */
zend_rc_debug = false;
#endif

php_dl(value, MODULE_PERSISTENT, &zv, 1);
php_dl(value, MODULE_PERSISTENT, &zv, PHP_DL_START_MODULE);

#if ZEND_RC_DEBUG
zend_rc_debug = orig_rc_debug;
Expand Down