diff options
| -rw-r--r-- | winsup/cygwin/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/cygwin/shared.cc | 30 |
2 files changed, 24 insertions, 13 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 575282657..f9505df4a 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,10 @@ +2011-11-18 Corinna Vinschen <corinna@vinschen.de> + + * shared.cc (get_shared_parent_dir): Use global shared_parent_dir + instead of local dir variable and create handle not inheritable to + avoid accumulating stray handles in child processes. + (get_session_parent_dir): Ditto with session_parent_dir variable. + 2011-11-17 Corinna Vinschen <corinna@vinschen.de> * shared.cc (shared_info::create): Open global shared data section diff --git a/winsup/cygwin/shared.cc b/winsup/cygwin/shared.cc index 70356b7e5..0f1be92af 100644 --- a/winsup/cygwin/shared.cc +++ b/winsup/cygwin/shared.cc @@ -127,15 +127,16 @@ init_installation_root () /* This function returns a handle to the top-level directory in the global NT namespace used to implement global objects including shared memory. */ +static HANDLE NO_COPY shared_parent_dir; + HANDLE get_shared_parent_dir () { - static HANDLE dir; UNICODE_STRING uname; OBJECT_ATTRIBUTES attr; NTSTATUS status; - if (!dir) + if (!shared_parent_dir) { WCHAR bnoname[MAX_PATH]; __small_swprintf (bnoname, L"\\BaseNamedObjects\\%s%s-%S", @@ -143,31 +144,33 @@ get_shared_parent_dir () _cygwin_testing ? cygwin_version.dll_build_date : "", &installation_key); RtlInitUnicodeString (&uname, bnoname); - InitializeObjectAttributes (&attr, &uname, OBJ_INHERIT | OBJ_OPENIF, - NULL, everyone_sd (CYG_SHARED_DIR_ACCESS)); - status = NtCreateDirectoryObject (&dir, CYG_SHARED_DIR_ACCESS, &attr); + InitializeObjectAttributes (&attr, &uname, OBJ_OPENIF, NULL, + everyone_sd (CYG_SHARED_DIR_ACCESS)); + status = NtCreateDirectoryObject (&shared_parent_dir, + CYG_SHARED_DIR_ACCESS, &attr); if (!NT_SUCCESS (status)) api_fatal ("NtCreateDirectoryObject(%S): %p", &uname, status); } - return dir; + return shared_parent_dir; } +static HANDLE NO_COPY session_parent_dir; + HANDLE get_session_parent_dir () { - static HANDLE dir; UNICODE_STRING uname; OBJECT_ATTRIBUTES attr; NTSTATUS status; - if (!dir) + if (!session_parent_dir) { PROCESS_SESSION_INFORMATION psi; status = NtQueryInformationProcess (NtCurrentProcess (), ProcessSessionInformation, &psi, sizeof psi, NULL); if (!NT_SUCCESS (status) || psi.SessionId == 0) - dir = get_shared_parent_dir (); + session_parent_dir = get_shared_parent_dir (); else { WCHAR bnoname[MAX_PATH]; @@ -177,14 +180,15 @@ get_session_parent_dir () _cygwin_testing ? cygwin_version.dll_build_date : "", &installation_key); RtlInitUnicodeString (&uname, bnoname); - InitializeObjectAttributes (&attr, &uname, OBJ_INHERIT | OBJ_OPENIF, - NULL, everyone_sd(CYG_SHARED_DIR_ACCESS)); - status = NtCreateDirectoryObject (&dir, CYG_SHARED_DIR_ACCESS, &attr); + InitializeObjectAttributes (&attr, &uname, OBJ_OPENIF, NULL, + everyone_sd(CYG_SHARED_DIR_ACCESS)); + status = NtCreateDirectoryObject (&session_parent_dir, + CYG_SHARED_DIR_ACCESS, &attr); if (!NT_SUCCESS (status)) api_fatal ("NtCreateDirectoryObject(%S): %p", &uname, status); } } - return dir; + return session_parent_dir; } char * __stdcall |