Skip to content

ext/session: Open session files with O_CLOEXEC #24376

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

Merged
jorgsowa merged 2 commits into from
Oct 16, 2026
+6 −2
Merged

ext/session: Open session files with O_CLOEXEC #24376

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d3c926
ext/session: Open session files with O_CLOEXEC
jorgsowa Oct 16, 2026
d85d356
ext/session: Build open() flags outside the macro call
jorgsowa Oct 16, 2026
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
8 changes: 6 additions & 2 deletions ext/session/mod_files.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,11 @@ static void ps_files_open(ps_files *data, /* const */ zend_string *key)
data->last_key = zend_string_copy(key);

/* O_NOFOLLOW to prevent us from following evil symlinks */
data->fd = VCWD_OPEN_MODE(buf, O_CREAT | O_RDWR | O_BINARY | O_NOFOLLOW, data->filemode);
int flags = O_CREAT | O_RDWR | O_BINARY | O_NOFOLLOW;
#ifdef O_CLOEXEC
flags |= O_CLOEXEC;
#endif
data->fd = VCWD_OPEN_MODE(buf, flags, data->filemode);

if (data->fd != -1) {
#ifndef PHP_WIN32
Expand All @@ -198,7 +202,7 @@ static void ps_files_open(ps_files *data, /* const */ zend_string *key)
ret = flock(data->fd, LOCK_EX);
} while (ret == -1 && errno == EINTR);

#ifdef F_SETFD
#if defined(F_SETFD) && !defined(O_CLOEXEC)
# ifndef FD_CLOEXEC
# define FD_CLOEXEC 1
# endif
Expand Down
Loading