diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-12-07 17:17:24 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-06-09 15:16:45 -0300 |
| commit | a6c813d0ad0fd9830f2cd3c3d079af8d2aa50a1f (patch) | |
| tree | 4a76233e9a815b23428b380ec689491ec9b8f7b4 /nptl/pthread_cancel.c | |
| parent | f779b1efb35fe141e47952af3ac7f0540acca401 (diff) | |
| download | glibc-a6c813d0ad0fd9830f2cd3c3d079af8d2aa50a1f.tar glibc-a6c813d0ad0fd9830f2cd3c3d079af8d2aa50a1f.tar.gz glibc-a6c813d0ad0fd9830f2cd3c3d079af8d2aa50a1f.tar.bz2 glibc-a6c813d0ad0fd9830f2cd3c3d079af8d2aa50a1f.zip | |
nptl: Use pthread_kill on pthread_cancel
It consolidates the tgkill call and it is the first step of making
pthread_cancel async-signal-safe. It also fix a possible issue
where the 'struct pthread' tid is not read atomically, which might
send an invalid cancellation signal (similar to what
db988e50a87f613cb6b9e98a2fc66a4848bc3546 fixed for pthread_join).
Checked on x86_64-linux-gnu and aarch64-linux-gnu.
Diffstat (limited to 'nptl/pthread_cancel.c')
| -rw-r--r-- | nptl/pthread_cancel.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/nptl/pthread_cancel.c b/nptl/pthread_cancel.c index de4659a1f0..0698cd2046 100644 --- a/nptl/pthread_cancel.c +++ b/nptl/pthread_cancel.c @@ -110,11 +110,7 @@ __pthread_cancel (pthread_t th) return 0; } - pid_t pid = __getpid (); - int val = INTERNAL_SYSCALL_CALL (tgkill, pid, pd->tid, SIGCANCEL); - return INTERNAL_SYSCALL_ERROR_P (val) - ? INTERNAL_SYSCALL_ERRNO (val) - : 0; + return __pthread_kill_internal (th, SIGCANCEL); } versioned_symbol (libc, __pthread_cancel, pthread_cancel, GLIBC_2_34); |