From 1d89eec53c7fefa7a4a8c011c9f19e3df64dc436 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Mon, 12 Jun 2023 16:33:20 +0300 Subject: [PATCH 4/9] Use FD_CLOEXEC on ListenSockets We went through some effort to close them in the child process. Better to not hand them down to the child process in the first place. --- src/backend/libpq/pqcomm.c | 6 +++++- src/backend/postmaster/postmaster.c | 14 ++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c index da5bb5fc5d3..9061daccc29 100644 --- a/src/backend/libpq/pqcomm.c +++ b/src/backend/libpq/pqcomm.c @@ -458,6 +458,9 @@ StreamServerPort(int family, const char *hostName, unsigned short portNumber, } #ifndef WIN32 + /* Don't give the listen socket to any subprograms we execute. */ + if (fcntl(fd, F_SETFD, FD_CLOEXEC) < 0) + elog(FATAL, "fcntl(F_SETFD) failed on socket: %m"); /* * Without the SO_REUSEADDR flag, a new postmaster can't be started @@ -831,7 +834,8 @@ StreamConnection(pgsocket server_fd, Port *port) void StreamClose(pgsocket sock) { - closesocket(sock); + if (closesocket(sock) != 0) + elog(LOG, "closesocket failed: %m"); } /* diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index bf9f0d27278..228744ebee5 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -497,7 +497,6 @@ typedef struct Port port; InheritableSocket portsocket; char DataDir[MAXPGPATH]; - pgsocket ListenSocket[MAXLISTEN]; int32 MyCancelKey; int MyPMChildSlot; #ifndef WIN32 @@ -2575,8 +2574,6 @@ ConnFree(Port *port) void ClosePostmasterPorts(bool am_syslogger) { - int i; - /* Release resources held by the postmaster's WaitEventSet. */ if (pm_wait_set) { @@ -2603,8 +2600,12 @@ ClosePostmasterPorts(bool am_syslogger) /* * Close the postmaster's listen sockets. These aren't tracked by fd.c, * so we don't call ReleaseExternalFD() here. + * + * The listen sockets are marked as FD_CLOEXEC, so this isn't needed in + * EXEC_BACKEND mode. */ - for (i = 0; i < MAXLISTEN; i++) +#ifndef EXEC_BACKEND + for (int i = 0; i < MAXLISTEN; i++) { if (ListenSocket[i] != PGINVALID_SOCKET) { @@ -2612,6 +2613,7 @@ ClosePostmasterPorts(bool am_syslogger) ListenSocket[i] = PGINVALID_SOCKET; } } +#endif /* * If using syslogger, close the read side of the pipe. We don't bother @@ -6035,8 +6037,6 @@ save_backend_variables(BackendParameters *param, Port *port, strlcpy(param->DataDir, DataDir, MAXPGPATH); - memcpy(¶m->ListenSocket, &ListenSocket, sizeof(ListenSocket)); - param->MyCancelKey = MyCancelKey; param->MyPMChildSlot = MyPMChildSlot; @@ -6273,8 +6273,6 @@ restore_backend_variables(BackendParameters *param, Port *port) SetDataDir(param->DataDir); - memcpy(&ListenSocket, ¶m->ListenSocket, sizeof(ListenSocket)); - MyCancelKey = param->MyCancelKey; MyPMChildSlot = param->MyPMChildSlot; -- 2.30.2