mirror of
https://sourceware.org/git/glibc.git
synced 2025-08-05 19:35:52 +03:00
e4585134ca
The use after free described in BZ#19951 is due the use of two different
PD fields, 'joinid' and 'cancelhandling', to describe the thread state
and to synchronize the calls of pthread_join, pthread_detach,
pthread_exit, and normal thread exit.
Any state change potentially requires to check for both field
atomically to handle partial state (such as pthread_join() with a
cancellation handler to issue a 'joinstate' field rollback).
This patch uses a different PD member with 4 possible states (JOINABLE,
DETACHED, EXITING, and EXITED) instead of pthread 'tid' field, with
the following logic:
1. On pthread_create the inital state is set either to JOINABLE or
DETACHED depending of the pthread attribute used.
2. On pthread_detach, a CAS is issued on the state. If the CAS
fails it means that thread is already detached (DETACHED) or is
being terminated (EXITING). For former an EINVAL is returned,
while for latter pthread_detach should be reponsible to join the
thread (and deallocate any internal resource).
3. In the exit phase of the wrapper function for the thread start
routine (reached either if the thread function has returned,
pthread_exit has being called, or cancellation handled has been
acted upon) we issue a CAS on state to set to EXITING mode. If the
thread is previously on DETACHED mode the thread itself is
responsible for arranging the deallocation of any resource,
otherwise the thread needs to be joined (detached threads cannot
immediately deallocate themselves).
4. The clear_tid_field on 'clone' call is changed to set the new
'state' field on thread exit (EXITED). This state is only
reached at thread termination.
5. The pthread_join implementation is now simpler: the futex wait
is done directly on thread state and there is no need to reset it
in case of timeout since the state is now set either by
pthread_detach() or by the kernel on process termination.
The race condition on pthread_detach is avoided with only one atomic
operation on PD state: once the mode is set to THREAD_STATE_DETACHED
it is up to thread itself to deallocate its memory (done on the exit
phase at pthread_create()).
Also, the INVALID_NOT_TERMINATED_TD_P is removed since a a negative
tid is not possible and the macro is not used anywhere.
This change trigger an invalid C11 thread tests: it crates a thread,
which detaches itself, and after a timeout the creating thread checks
if the join fails. The issue is once thrd_join() is called the thread
lifetime is not defined.
Checked on x86_64-linux-gnu, i686-linux-gnu, aarch64-linux-gnu,
arm-linux-gnueabihf, and powerpc64-linux-gnu.
55 lines
2.0 KiB
C
55 lines
2.0 KiB
C
/* Copyright (C) 2002-2025 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
#include <time.h>
|
|
#include "pthreadP.h"
|
|
#include <shlib-compat.h>
|
|
|
|
int
|
|
___pthread_timedjoin_np64 (pthread_t threadid, void **thread_return,
|
|
const struct __timespec64 *abstime)
|
|
{
|
|
return __pthread_clockjoin_ex (threadid, thread_return,
|
|
CLOCK_REALTIME, abstime);
|
|
}
|
|
|
|
#if __TIMESIZE == 64
|
|
strong_alias (___pthread_timedjoin_np64, ___pthread_timedjoin_np)
|
|
#else /* __TIMESPEC64 != 64 */
|
|
strong_alias (___pthread_timedjoin_np64, __pthread_timedjoin_np64)
|
|
libc_hidden_def (__pthread_timedjoin_np64)
|
|
|
|
int
|
|
___pthread_timedjoin_np (pthread_t threadid, void **thread_return,
|
|
const struct timespec *abstime)
|
|
{
|
|
if (abstime != NULL)
|
|
{
|
|
struct __timespec64 ts64 = valid_timespec_to_timespec64 (*abstime);
|
|
return __pthread_timedjoin_np64 (threadid, thread_return, &ts64);
|
|
}
|
|
else
|
|
return __pthread_timedjoin_np64 (threadid, thread_return, NULL);
|
|
}
|
|
#endif /* __TIMESPEC64 != 64 */
|
|
versioned_symbol (libc, ___pthread_timedjoin_np, pthread_timedjoin_np,
|
|
GLIBC_2_34);
|
|
#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_34)
|
|
compat_symbol (libpthread, ___pthread_timedjoin_np, pthread_timedjoin_np,
|
|
GLIBC_2_3_3);
|
|
#endif
|