diff options
| author | Andreas Schwab <schwab@redhat.com> | 2009-11-27 21:37:30 -0800 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2009-11-27 21:37:30 -0800 |
| commit | b55ec98c6490b944593243c7da54dda1796e3f84 (patch) | |
| tree | efba6585541d97413a616db562ba3c0e4ffda0f6 /nptl/sysdeps/unix/sysv | |
| parent | e2c59de609151c643be697fd243ffe0b92753f43 (diff) | |
| download | glibc-b55ec98c6490b944593243c7da54dda1796e3f84.tar.gz glibc-b55ec98c6490b944593243c7da54dda1796e3f84.tar.xz glibc-b55ec98c6490b944593243c7da54dda1796e3f84.zip | |
Fix infloop in __pthread_disable_asynccancel on x86_64
Diffstat (limited to 'nptl/sysdeps/unix/sysv')
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S b/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S index 0d48ec6fcd..680696200a 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S @@ -96,8 +96,8 @@ ENTRY(__pthread_disable_asynccancel) cmpxchgl %r11d, %fs:CANCELHANDLING jnz 2b -3: movl %r11d, %eax - andl $(TCB_CANCELING_BITMASK|TCB_CANCELED_BITMASK), %eax + movl %r11d, %eax +3: andl $(TCB_CANCELING_BITMASK|TCB_CANCELED_BITMASK), %eax cmpl $TCB_CANCELING_BITMASK, %eax je 4f 1: ret @@ -111,5 +111,6 @@ ENTRY(__pthread_disable_asynccancel) addq $CANCELHANDLING, %rdi LOAD_PRIVATE_FUTEX_WAIT (%esi) syscall + movl %fs:CANCELHANDLING, %eax jmp 3b END(__pthread_disable_asynccancel) |