Skip to content

Do not use RTLD_DEEPBIND if dlmopen is available #18612

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

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
+16 −1
Open

Do not use RTLD_DEEPBIND if dlmopen is available #18612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
fe18f08
Do not use RTLD_DEEPBIND if dlmopen is available
danog May 21, 2025
ced06f8
Re-enable RTLD_DEEPBIND when on apache for a different reason
danog May 29, 2025
5919d0b
Use a sapi config instead
danog May 29, 2025
e4297b0
Add missing include
danog May 29, 2025
d8bb1aa
CS
danog May 31, 2025
fe761cc
Add missing includes
danog Jun 1, 2025
9f749bc
Fix
danog Jun 1, 2025
8292577
Switch to flags
danog Jun 1, 2025
7d59f7c
Remove unneeded SAPI include
danog Jun 10, 2025
a21c3e4
Revert "Remove unneeded SAPI include"
danog Jun 10, 2025
c527785
Bump
danog Jun 19, 2025
f368a31
Merge remote-tracking branch 'origin/master' into disable_deepbind_us…
danog Jun 19, 2025
680a887
Cleanup
danog Jun 19, 2025
77a3e9d
Test
danog Jun 19, 2025
990316e
Fixup
danog Jun 19, 2025
2892cbd
Test
danog Jun 19, 2025
b6c6e5d
Fix typo
danog Jun 19, 2025
8051d71
Refactor
danog Jun 20, 2025
91e58d0
Merge remote-tracking branch 'origin/master' into disable_deepbind_us…
danog Jun 20, 2025
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
7 changes: 7 additions & 0 deletions Zend/zend_API.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,20 @@
/* these variables are true statics/globals, and have to be mutex'ed on every access */
ZEND_API HashTable module_registry;

ZEND_API bool zend_dl_use_deepbind = false;

static zend_module_entry **module_request_startup_handlers;
static zend_module_entry **module_request_shutdown_handlers;
static zend_module_entry **module_post_deactivate_handlers;
static zend_module_entry **modules_dl_loaded;

static zend_class_entry **class_cleanup_handlers;

ZEND_API void zend_set_dl_use_deepbind(bool use_deepbind)
{
zend_dl_use_deepbind = use_deepbind;
}

ZEND_API zend_result zend_get_parameters_array_ex(uint32_t param_count, zval *argument_array) /* {{{ */
{
zval *param_ptr;
Expand Down
2 changes: 2 additions & 0 deletions Zend/zend_API.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,8 @@ typedef struct _zend_fcall_info_cache {
ZEND_API int zend_next_free_module(void);

BEGIN_EXTERN_C()
ZEND_API void zend_set_dl_use_deepbind(bool use_deepbind);

ZEND_API zend_result zend_get_parameters_array_ex(uint32_t param_count, zval *argument_array);

/* internal function to efficiently copy parameters when executing __call() */
Expand Down
7 changes: 6 additions & 1 deletion Zend/zend_portability.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,12 @@
# if defined(RTLD_GROUP) && defined(RTLD_WORLD) && defined(RTLD_PARENT)
# define DL_LOAD(libname) dlopen(libname, PHP_RTLD_MODE | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT)
# elif defined(RTLD_DEEPBIND) && !defined(__SANITIZE_ADDRESS__) && !__has_feature(memory_sanitizer)
# define DL_LOAD(libname) dlopen(libname, PHP_RTLD_MODE | RTLD_GLOBAL | RTLD_DEEPBIND)
# if defined(LM_ID_NEWLM)
ZEND_API extern bool zend_dl_use_deepbind;
# define DL_LOAD(libname) dlopen(libname, PHP_RTLD_MODE | RTLD_GLOBAL | (zend_dl_use_deepbind ? RTLD_DEEPBIND : 0))
# else
# define DL_LOAD(libname) dlopen(libname, PHP_RTLD_MODE | RTLD_GLOBAL | RTLD_DEEPBIND)
# endif
# else
# define DL_LOAD(libname) dlopen(libname, PHP_RTLD_MODE | RTLD_GLOBAL)
# endif
Expand Down
1 change: 1 addition & 0 deletions sapi/apache2handler/sapi_apache2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,7 @@ php_apache_server_startup(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp
{
void *data = NULL;
const char *userdata_key = "apache2hook_post_config";
zend_set_dl_use_deepbind(true);

/* Apache will load, unload and then reload a DSO module. This
* prevents us from starting PHP until the second load. */
Expand Down