Skip to content

sapi/phpdbg: Update of userfaultfd workflow. #13955

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.

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
merged 1 commit into from
Apr 30, 2024
Merged
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion sapi/phpdbg/phpdbg_watch.c
Original file line number Diff line number Diff line change
Expand Up @@ -1472,7 +1472,14 @@ void phpdbg_setup_watchpoints(void) {
PHPDBG_G(watch_tmp) = NULL;

#ifdef HAVE_USERFAULTFD_WRITEFAULT
PHPDBG_G(watch_userfaultfd) = syscall(SYS_userfaultfd, O_CLOEXEC);
int flags = O_CLOEXEC;
#ifdef UFFD_USER_MODE_ONLY
// unpriviliged userfaultfd are disabled by default,
// with this flag it allows ranges from the user space
// being reported.
flags |= UFFD_USER_MODE_ONLY;
#endif
PHPDBG_G(watch_userfaultfd) = syscall(SYS_userfaultfd, flags);
if (PHPDBG_G(watch_userfaultfd) < 0) {
PHPDBG_G(watch_userfaultfd) = 0;
} else {
Expand Down
Loading