bpo-33015: Fix UB in pthread PyThread_start_new_thread (GH-6008) (GH-10823)
Fix an undefined behaviour in the pthread implementation of
PyThread_start_new_thread(): add a function wrapper to always return
NULL.
Add pythread_callback struct and pythread_wrapper() to thread_pthread.h.
(cherry picked from commit 9eea6eaf23
)
This commit is contained in:
parent
dab59fa560
commit
8f83c2fb19
|
@ -0,0 +1,3 @@
|
|||
Fix an undefined behaviour in the pthread implementation of
|
||||
:c:func:`PyThread_start_new_thread`: add a function wrapper to always return
|
||||
``NULL``.
|
|
@ -156,6 +156,28 @@ PyThread__init_thread(void)
|
|||
* Thread support.
|
||||
*/
|
||||
|
||||
/* bpo-33015: pythread_callback struct and pythread_wrapper() cast
|
||||
"void func(void *)" to "void* func(void *)": always return NULL.
|
||||
|
||||
PyThread_start_new_thread() uses "void func(void *)" type, whereas
|
||||
pthread_create() requires a void* return value. */
|
||||
typedef struct {
|
||||
void (*func) (void *);
|
||||
void *arg;
|
||||
} pythread_callback;
|
||||
|
||||
static void *
|
||||
pythread_wrapper(void *arg)
|
||||
{
|
||||
/* copy func and func_arg and free the temporary structure */
|
||||
pythread_callback *callback = arg;
|
||||
void (*func)(void *) = callback->func;
|
||||
void *func_arg = callback->arg;
|
||||
PyMem_Free(arg);
|
||||
|
||||
func(func_arg);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
long
|
||||
PyThread_start_new_thread(void (*func)(void *), void *arg)
|
||||
|
@ -191,21 +213,31 @@ PyThread_start_new_thread(void (*func)(void *), void *arg)
|
|||
pthread_attr_setscope(&attrs, PTHREAD_SCOPE_SYSTEM);
|
||||
#endif
|
||||
|
||||
pythread_callback *callback = PyMem_Malloc(sizeof(pythread_callback));
|
||||
|
||||
if (callback == NULL) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
callback->func = func;
|
||||
callback->arg = arg;
|
||||
|
||||
status = pthread_create(&th,
|
||||
#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
|
||||
&attrs,
|
||||
#else
|
||||
(pthread_attr_t*)NULL,
|
||||
#endif
|
||||
(void* (*)(void *))func,
|
||||
(void *)arg
|
||||
);
|
||||
pythread_wrapper, callback);
|
||||
|
||||
#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
|
||||
pthread_attr_destroy(&attrs);
|
||||
#endif
|
||||
if (status != 0)
|
||||
|
||||
if (status != 0) {
|
||||
PyMem_Free(callback);
|
||||
return -1;
|
||||
}
|
||||
|
||||
pthread_detach(th);
|
||||
|
||||
|
|
Loading…
Reference in New Issue