Skip to content

Apply FD_CLOEXEC on sockets #1301

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
michael-grunder merged 5 commits into from
May 25, 2025
+27 −4
Merged

Apply FD_CLOEXEC on sockets #1301

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
386c5c3
Apply FD_CLOEXEC on sockets
May 22, 2025
826a640
Added an options flag, switched to SOCK_CLOEXEC to set the option ato…
May 22, 2025
6e587c7
More elegant flow
May 23, 2025
7753d02
Remove endif comment
lennyly May 23, 2025
fea7e2a
Remove another endif comment
lennyly May 23, 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
18 changes: 18 additions & 0 deletions net.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,14 @@ static int redisCreateSocket(redisContext *c, int type) {
return REDIS_ERR;
}
c->fd = s;

/* Prevent file descriptor from leaking to child processes */
if (fcntl(s, F_SETFD, FD_CLOEXEC) == -1) {
__redisSetErrorFromErrno(c,REDIS_ERR_IO,"fcntl(FD_CLOEXEC)");
redisNetClose(c);
return REDIS_ERR;
}

if (type == AF_INET) {
if (redisSetReuseAddr(c) == REDIS_ERR) {
return REDIS_ERR;
Expand Down Expand Up @@ -517,6 +525,16 @@ static int _redisContextConnectTcp(redisContext *c, const char *addr, int port,
continue;

c->fd = s;

#ifndef _WIN32
/* Prevent file descriptor from leaking to child processes */
if (fcntl(s, F_SETFD, FD_CLOEXEC) == -1) {
__redisSetErrorFromErrno(c,REDIS_ERR_IO,"fcntl(FD_CLOEXEC)");
redisNetClose(c);
goto error;
}
#endif

if (redisSetBlocking(c,0) != REDIS_OK)
goto error;
if (c->tcp.source_addr) {
Expand Down
Loading