Skip to content

ext/session/mod_mm: initialize mm instance in open handler #21192

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
Girgias wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

ext/session/mod_mm: initialize mm instance in open handler #21192

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
70 changes: 36 additions & 34 deletions ext/session/mod_mm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,28 +264,50 @@ static void ps_mm_destroy(ps_mm *data)

PHP_MINIT_FUNCTION(ps_mm)
{
size_t save_path_len = ZSTR_LEN(PS(save_path));
size_t mod_name_len = strlen(sapi_module.name);
size_t euid_len;
char *ps_mm_path, euid[30];
zend_result ret;
ps_mm_instance = NULL;
php_session_register_module(&ps_mod_mm);
return SUCCESS;
}

ps_mm_instance = calloc(sizeof(*ps_mm_instance), 1);
if (!ps_mm_instance) {
PHP_MSHUTDOWN_FUNCTION(ps_mm)
{
if (ps_mm_instance) {
ps_mm_destroy(ps_mm_instance);
return SUCCESS;
}
return FAILURE;
}

PS_OPEN_FUNC(mm)
{
if (ps_mm_instance) {
ps_mm_debug(("open: ps_mm_instance=%p\n", ps_mm_instance));
PS_SET_MOD_DATA(ps_mm_instance);
return SUCCESS;
}

char euid[30];
size_t euid_len = slprintf(euid, sizeof(euid), "%d", geteuid());
Copy link
Member

@devnexen devnexen Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

one little nit not related to your change, uid_t is unsigned int on linux.

if (!euid_len) {
return FAILURE;
}

if (!(euid_len = slprintf(euid, sizeof(euid), "%d", geteuid()))) {
free(ps_mm_instance);
ps_mm_instance = NULL;
ps_mm_instance = calloc(1, sizeof(*ps_mm_instance));
if (!ps_mm_instance) {
return FAILURE;
}
ps_mm_debug(("open: ps_mm_instance=%p\n", ps_mm_instance));

const char *save_path_cstr = ZSTR_VAL(save_path);
size_t save_path_len = ZSTR_LEN(save_path);
size_t mod_name_len = strlen(sapi_module.name);


/* Directory + '/' + File + Module Name + Effective UID + \0 */
ps_mm_path = emalloc(save_path_len + 1 + (sizeof(PS_MM_FILE) - 1) + mod_name_len + euid_len + 1);
char *ps_mm_path = emalloc(save_path_len + 1 + (sizeof(PS_MM_FILE) - 1) + mod_name_len + euid_len + 1);

memcpy(ps_mm_path, ZSTR_VAL(PS(save_path)), save_path_len);
if (save_path_len && ZSTR_VAL(PS(save_path))[save_path_len - 1] != DEFAULT_SLASH) {
memcpy(ps_mm_path, save_path_cstr, save_path_len);
if (save_path_len && save_path_cstr[save_path_len - 1] != DEFAULT_SLASH) {
ps_mm_path[save_path_len] = DEFAULT_SLASH;
save_path_len++;
}
Expand All @@ -296,7 +318,7 @@ PHP_MINIT_FUNCTION(ps_mm)
memcpy(ps_mm_path + save_path_len, euid, euid_len);
ps_mm_path[save_path_len + euid_len] = '\0';

ret = ps_mm_initialize(ps_mm_instance, ps_mm_path);
zend_result ret = ps_mm_initialize(ps_mm_instance, ps_mm_path);

efree(ps_mm_path);

Expand All @@ -306,26 +328,6 @@ PHP_MINIT_FUNCTION(ps_mm)
return FAILURE;
}

php_session_register_module(&ps_mod_mm);
return SUCCESS;
}

PHP_MSHUTDOWN_FUNCTION(ps_mm)
{
if (ps_mm_instance) {
ps_mm_destroy(ps_mm_instance);
return SUCCESS;
}
return FAILURE;
}

PS_OPEN_FUNC(mm)
{
ps_mm_debug(("open: ps_mm_instance=%p\n", ps_mm_instance));

if (!ps_mm_instance) {
return FAILURE;
}
PS_SET_MOD_DATA(ps_mm_instance);

return SUCCESS;
Expand Down
Loading