adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

posix: pthread: check canceltype before async cancel

Browse source 
The default pthread cancellation type is deferred.

Check that the canceltype is asynchronous (with
respect to cancellation points) before cancelling
a thread.

Signed-off-by: Christopher Friedt <cfriedt@meta.com>
This commit is contained in:
Christopher Friedt 2024-01-24 16:39:08 -05:00 committed by Chris Friedt
parent 301581a892
commit dbcba2f46c
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/posix/pthread.c
View file

@ -638,6 +638,7 @@ int pthread_setcanceltype(int type, int *oldtype)
int pthread_cancel(pthread_t pthread) int pthread_cancel(pthread_t pthread)
{ {
int cancel_state; int cancel_state;
int cancel_type;
k_spinlock_key_t key; k_spinlock_key_t key;
struct posix_thread *t; struct posix_thread *t;
@ -649,9 +650,11 @@ int pthread_cancel(pthread_t pthread)
key = k_spin_lock(&pthread_pool_lock); key = k_spin_lock(&pthread_pool_lock);
t->cancel_pending = true; t->cancel_pending = true;
cancel_state = t->cancel_state; cancel_state = t->cancel_state;
cancel_type = t->cancel_type;
k_spin_unlock(&pthread_pool_lock, key); k_spin_unlock(&pthread_pool_lock, key);
if (cancel_state == PTHREAD_CANCEL_ENABLE) { if (cancel_state == PTHREAD_CANCEL_ENABLE &&
cancel_type == PTHREAD_CANCEL_ASYNCHRONOUS) {
posix_thread_finalize(t, PTHREAD_CANCELED); posix_thread_finalize(t, PTHREAD_CANCELED);
} }