diff options
| author | Rich Felker <dalias@aerifal.cx> | 2015-11-02 12:39:28 -0500 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2015-11-02 12:41:49 -0500 |
| commit | cb1bf2f321b45a06447133b3db00621b7300c456 (patch) | |
| tree | 50518595b1f221270ec0a209b5252c85d4ba140c /arch/x32 | |
| parent | fead7e3fc04729b4cc8a5feec4a172b389395212 (diff) | |
| download | musl-cb1bf2f321b45a06447133b3db00621b7300c456.tar.gz musl-cb1bf2f321b45a06447133b3db00621b7300c456.tar.xz musl-cb1bf2f321b45a06447133b3db00621b7300c456.zip | |
properly access mcontext_t program counter in cancellation handler
using the actual mcontext_t definition rather than an overlaid pointer array both improves correctness/readability and eliminates some ugly hacks for archs with 64-bit registers bit 32-bit program counter. also fix UB due to comparison of pointers not in a common array object.
Diffstat (limited to 'arch/x32')
| -rw-r--r-- | arch/x32/pthread_arch.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x32/pthread_arch.h b/arch/x32/pthread_arch.h index 033bfd69..ecb0bbfb 100644 --- a/arch/x32/pthread_arch.h +++ b/arch/x32/pthread_arch.h @@ -7,6 +7,6 @@ static inline struct pthread *__pthread_self() #define TP_ADJ(p) (p) -#define CANCEL_REG_IP 32 +#define MC_PC gregs[REG_RIP] #define CANARY canary2 |