From 8985f1c7c4d621498642e1c0fd349a5526006de4 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 13 Sep 2021 22:02:51 +0200 Subject: [PATCH] Cygwin: pipes: do not duplicate sec_none{_nih} locally when creating objects We already fetched the correct SECURITY_ATTRIBUTES at the start of fhandler_pipe::create, so using another SECURITY_ATTRIBUTES object for the mutex and semaphore objects doesn't make much sense. Signed-off-by: Corinna Vinschen --- winsup/cygwin/fhandler_pipe.cc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/winsup/cygwin/fhandler_pipe.cc b/winsup/cygwin/fhandler_pipe.cc index 62cb1c0ec..70cfa3784 100644 --- a/winsup/cygwin/fhandler_pipe.cc +++ b/winsup/cygwin/fhandler_pipe.cc @@ -769,11 +769,7 @@ fhandler_pipe::create (fhandler_pipe *fhs[2], unsigned psize, int mode) unique_id); /* For the read side of the pipe, add a mutex. See raw_read for the usage. */ - SECURITY_ATTRIBUTES sa = { .nLength = sizeof (SECURITY_ATTRIBUTES), - .lpSecurityDescriptor = NULL, - .bInheritHandle = !(mode & O_CLOEXEC) - }; - HANDLE mtx = CreateMutexW (&sa, FALSE, NULL); + HANDLE mtx = CreateMutexW (sa, FALSE, NULL); if (!mtx) { delete fhs[0]; @@ -786,11 +782,11 @@ fhandler_pipe::create (fhandler_pipe *fhs[2], unsigned psize, int mode) fhs[0]->set_read_mutex (mtx); res = 0; } - fhs[0]->select_sem = CreateSemaphore (&sa, 0, INT32_MAX, NULL); + fhs[0]->select_sem = CreateSemaphore (sa, 0, INT32_MAX, NULL); if (fhs[0]->select_sem) DuplicateHandle (GetCurrentProcess (), fhs[0]->select_sem, GetCurrentProcess (), &fhs[1]->select_sem, - 0, !(mode & O_CLOEXEC), DUPLICATE_SAME_ACCESS); + 0, sa->bInheritHandle, DUPLICATE_SAME_ACCESS); } debug_printf ("%R = pipe([%p, %p], %d, %y)", res, fhs[0], fhs[1], psize, mode);