DWS/chrony
1
0
Fork 0
mirror of https://gitlab.com/chrony/chrony.git synced 2025-12-04 02:15:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

nts: close socket in helper process on exit

Browse Source 
Close the socket used for receiving helper requests before exit to avoid
another valgrind error.
This commit is contained in:
Miroslav Lichvar
2024-11-28 14:45:23 +01:00
parent 26fef1751a
commit 7196943f11
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
nts_ke_server.c
View File

@@ -702,7 +702,7 @@ key_timeout(void *arg)
/* ================================================== */ /* ================================================== */
static void static void
run_helper(uid_t uid, gid_t gid, int scfilter_level) run_helper(uid_t uid, gid_t gid, int scfilter_level, int sock_fd)
{ {
LOG_Severity log_severity; LOG_Severity log_severity;
@@ -729,10 +729,15 @@ run_helper(uid_t uid, gid_t gid, int scfilter_level)
if (scfilter_level != 0) if (scfilter_level != 0)
SYS_EnableSystemCallFilter(scfilter_level, SYS_NTSKE_HELPER); SYS_EnableSystemCallFilter(scfilter_level, SYS_NTSKE_HELPER);
SCH_AddFileHandler(sock_fd, SCH_FILE_INPUT, handle_helper_request, NULL);
SCH_MainLoop(); SCH_MainLoop();
DEBUG_LOG("Helper exiting"); DEBUG_LOG("Helper exiting");
SCH_RemoveFileHandler(sock_fd);
close(sock_fd);
NKS_Finalise(); NKS_Finalise();
SCK_Finalise(); SCK_Finalise();
SYS_Finalise(); SYS_Finalise();
@@ -792,9 +797,8 @@ NKS_PreInitialise(uid_t uid, gid_t gid, int scfilter_level)
LOG_CloseParentFd(); LOG_CloseParentFd();
SCK_CloseSocket(sock_fd1); SCK_CloseSocket(sock_fd1);
SCH_AddFileHandler(sock_fd2, SCH_FILE_INPUT, handle_helper_request, NULL);
run_helper(uid, gid, scfilter_level); run_helper(uid, gid, scfilter_level, sock_fd2);
} }
SCK_CloseSocket(sock_fd2); SCK_CloseSocket(sock_fd2);