[PATCH] Cygwin: pthread: Fix handle leak in pthread_once.

[PATCH] Cygwin: pthread: Fix handle leak in pthread_once.

[Takashi Yano]

If pthread_once() is called with pthread_once_t initialized using
PTREAD_ONCE_INIT, pthread_once does not release pthread_mutex used
internally. This patch fixes that by calling pthread_mutex_destroy()
in the thread which has called init_routine.

Reviewed-by: Corinna Vinschen <corinna@vinschen.de>
Signed-off-by: Takashi Yano <takashi.yano@nifty.ne.jp>
---
 winsup/cygwin/thread.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc
index 7bb4f9fc8..0f8327831 100644
--- a/winsup/cygwin/thread.cc
+++ b/winsup/cygwin/thread.cc
@@ -2060,6 +2060,9 @@ pthread::once (pthread_once_t *once_control, void (*init_routine) (void))
     {
       init_routine ();
       once_control->state = 1;
+      pthread_mutex_unlock (&once_control->mutex);
+      while (pthread_mutex_destroy (&once_control->mutex) == EBUSY);
+      return 0;
     }
   /* Here we must remove our cancellation handler */
   pthread_mutex_unlock (&once_control->mutex);
-- 
2.43.0

Re: [PATCH] Cygwin: pthread: Fix handle leak in pthread_once.

[Corinna Vinschen]

On Jan 24 22:44, Takashi Yano wrote:
> If pthread_once() is called with pthread_once_t initialized using
> PTREAD_ONCE_INIT, pthread_once does not release pthread_mutex used
> internally. This patch fixes that by calling pthread_mutex_destroy()
> in the thread which has called init_routine.
> 
> Reviewed-by: Corinna Vinschen <corinna@vinschen.de>
> Signed-off-by: Takashi Yano <takashi.yano@nifty.ne.jp>
> ---
>  winsup/cygwin/thread.cc | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc
> index 7bb4f9fc8..0f8327831 100644
> --- a/winsup/cygwin/thread.cc
> +++ b/winsup/cygwin/thread.cc
> @@ -2060,6 +2060,9 @@ pthread::once (pthread_once_t *once_control, void (*init_routine) (void))
>      {
>        init_routine ();
>        once_control->state = 1;
> +      pthread_mutex_unlock (&once_control->mutex);
> +      while (pthread_mutex_destroy (&once_control->mutex) == EBUSY);
> +      return 0;
>      }
>    /* Here we must remove our cancellation handler */
>    pthread_mutex_unlock (&once_control->mutex);
> -- 
> 2.43.0

Sure, please push.

(You don't have to CC me, btw., I only get the same mail twice then
and I look into this mailing list constantly anyway)


Thanks,
Corinna

Re: [PATCH] Cygwin: pthread: Fix handle leak in pthread_once.

[Takashi Yano]

On Wed, 24 Jan 2024 15:40:22 +0100
Corinna Vinschen wrote:
> (You don't have to CC me, btw., I only get the same mail twice then
> and I look into this mailing list constantly anyway)

Perhaps, CC: is added automatically by git send-email if
Reviewed-by: exists. I'll try --no-cc option next time.

Thanks.

-- 
Takashi Yano <takashi.yano@nifty.ne.jp>

Re: [PATCH] Cygwin: pthread: Fix handle leak in pthread_once.

[Corinna Vinschen]

On Jan 24 23:48, Takashi Yano wrote:
> On Wed, 24 Jan 2024 15:40:22 +0100
> Corinna Vinschen wrote:
> > (You don't have to CC me, btw., I only get the same mail twice then
> > and I look into this mailing list constantly anyway)
> 
> Perhaps, CC: is added automatically by git send-email if
> Reviewed-by: exists. I'll try --no-cc option next time.

No worries.  No reason for jumping through hoops, just for an extra
mail.


Thanks,
Corinna