Skip to content

set CLOEXEC on diagnostic server FDs #55850

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
stephentoub merged 4 commits into from
Jul 18, 2021
Merged

set CLOEXEC on diagnostic server FDs #55850

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f9366e7
set CLOEXEC on diagnostic server FDs
Jul 16, 2021
90833ac
Add assert and comment
Jul 16, 2021
97eea94
fix compiler warning
Jul 16, 2021
b91e1a1
simplify asserts to appease all the different builds
Jul 16, 2021
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
Prev Previous commit
Next Next commit
Add assert and comment
  • Loading branch information
John Salem committed Jul 16, 2021
commit 90833acea8253a817c3d1c1c757b7df19c5f1b29
6 changes: 4 additions & 2 deletions src/native/eventpipe/ds-ipc-pal-socket.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,8 @@ ipc_socket_create_uds (DiagnosticsIpc *ipc)
DS_ENTER_BLOCKING_PAL_SECTION;
new_socket = socket (ipc->server_address_family, socket_type, 0);
#ifndef SOCK_CLOEXEC
fcntl(new_socket, F_SETFD, FD_CLOEXEC);
int fcntl_rc = fcntl(new_socket, F_SETFD, FD_CLOEXEC); // best effort; don't validate return value
EP_ASSERT (fcntl_rc != -1);
#endif // SOCK_CLOEXEC
DS_EXIT_BLOCKING_PAL_SECTION;
return new_socket;
Expand Down Expand Up @@ -351,7 +352,8 @@ ipc_socket_create_tcp (DiagnosticsIpc *ipc)
DS_ENTER_BLOCKING_PAL_SECTION;
new_socket = socket (ipc->server_address_family, socket_type, IPPROTO_TCP);
#ifndef SOCK_CLOEXEC
fcntl(new_socket, F_SETFD, FD_CLOEXEC);
int fcntl_rc = fcntl(new_socket, F_SETFD, FD_CLOEXEC); // best effort; don't validate return value
EP_ASSERT(fcntl_rc != -1);
#endif // SOCK_CLOEXEC
if (new_socket != DS_IPC_INVALID_SOCKET) {
int option_value = 1;
Expand Down