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.

diff --git a/arch/aarch64/pthread_arch.h b/arch/aarch64/pthread_arch.h
index 74276f4c618643fce615f7394ca18753ac4f1322..b2e2d8f13a5025aaa7da02b0050543c7fab0303a 100644 (file)
--- a/arch/aarch64/pthread_arch.h
+++ b/arch/aarch64/pthread_arch.h
@@ -8,4 +8,4 @@ static inline struct pthread *__pthread_self()
 #define TLS_ABOVE_TP
 #define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) - 16)
 
-#define CANCEL_REG_IP 33
+#define MC_PC pc

diff --git a/arch/arm/pthread_arch.h b/arch/arm/pthread_arch.h
index 4a4dd09e9c8c26ec5c2df436fef18e8813371dcf..8b8a7fb645cb7650a2e10b2cd362cd74aa5142bc 100644 (file)
--- a/arch/arm/pthread_arch.h
+++ b/arch/arm/pthread_arch.h
@@ -27,4 +27,4 @@ static inline pthread_t __pthread_self()
 #define TLS_ABOVE_TP
 #define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) - 8)
 
-#define CANCEL_REG_IP 18
+#define MC_PC arm_pc

diff --git a/arch/i386/pthread_arch.h b/arch/i386/pthread_arch.h
index 1c06c7641df683b9ffe14c0e91f0b1da192abbe0..7f38a56289032a3026a1580a798118e7214ae3ac 100644 (file)
--- a/arch/i386/pthread_arch.h
+++ b/arch/i386/pthread_arch.h
@@ -7,4 +7,4 @@ static inline struct pthread *__pthread_self()
 
 #define TP_ADJ(p) (p)
 
-#define CANCEL_REG_IP 14
+#define MC_PC gregs[REG_EIP]

diff --git a/arch/microblaze/pthread_arch.h b/arch/microblaze/pthread_arch.h
index 259d3d615ab1fb30755d48a03730c1a5d3005eff..08d1ba7db35f52d7ca507dc0e82f7bc6da21aa0b 100644 (file)
--- a/arch/microblaze/pthread_arch.h
+++ b/arch/microblaze/pthread_arch.h
@@ -7,4 +7,4 @@ static inline struct pthread *__pthread_self()
 
 #define TP_ADJ(p) (p)
 
-#define CANCEL_REG_IP 32
+#define MC_PC regs.pc

diff --git a/arch/mips/pthread_arch.h b/arch/mips/pthread_arch.h
index 93edbd4ed42138b10eaa25d4b1f1a9fa4e3e3664..8a49965496928b8d1df438f2d184c93678253300 100644 (file)
--- a/arch/mips/pthread_arch.h
+++ b/arch/mips/pthread_arch.h
@@ -16,4 +16,4 @@ static inline struct pthread *__pthread_self()
 
 #define DTP_OFFSET 0x8000
 
-#define CANCEL_REG_IP (3-(union {int __i; char __b;}){1}.__b)
+#define MC_PC pc

diff --git a/arch/or1k/pthread_arch.h b/arch/or1k/pthread_arch.h
index ad631694fb6b0efce86a9ab71cd126f5b13d433f..7decd769a8598ab35de5293ccc2bf58b51a3c414 100644 (file)
--- a/arch/or1k/pthread_arch.h
+++ b/arch/or1k/pthread_arch.h
@@ -14,5 +14,4 @@ static inline struct pthread *__pthread_self()
 #define TLS_ABOVE_TP
 #define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread))
 
-/* word-offset to 'pc' in mcontext_t */
-#define CANCEL_REG_IP 32
+#define MC_PC regs.pc

diff --git a/arch/powerpc/pthread_arch.h b/arch/powerpc/pthread_arch.h
index bb7405d112d7f4244afbccbd15a459e2ce5fddb7..7c5c4fadb2116382e4a3a15a8e2a7adbaa95bb06 100644 (file)
--- a/arch/powerpc/pthread_arch.h
+++ b/arch/powerpc/pthread_arch.h
@@ -15,9 +15,8 @@ static inline struct pthread *__pthread_self()
 
 #define DTP_OFFSET 0x8000
 
-// offset of the PC register in mcontext_t, divided by the system wordsize
 // the kernel calls the ip "nip", it's the first saved value after the 32
 // GPRs.
-#define CANCEL_REG_IP 32
+#define MC_PC gregs[32]
 
 #define CANARY canary_at_end

diff --git a/arch/sh/pthread_arch.h b/arch/sh/pthread_arch.h
index 65c389ff460519871eebd99228c809601c414139..2756e7ec1934069e70fb996a680467f904264b39 100644 (file)
--- a/arch/sh/pthread_arch.h
+++ b/arch/sh/pthread_arch.h
@@ -8,4 +8,4 @@ static inline struct pthread *__pthread_self()
 #define TLS_ABOVE_TP
 #define TP_ADJ(p) ((char *)(p) + sizeof(struct pthread) - 8)
 
-#define CANCEL_REG_IP 17
+#define MC_PC sc_pc

diff --git a/arch/x32/pthread_arch.h b/arch/x32/pthread_arch.h
index 033bfd69a34b5ce446f6c4506ce549d41e8e3121..ecb0bbfb04039f77fee354e49bd4858129df10e3 100644 (file)
--- 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

diff --git a/arch/x86_64/pthread_arch.h b/arch/x86_64/pthread_arch.h
index 29e4590c16601909b9452eb6440a7374dad6498c..c61509cf3e37e4c7f839dfdc53e530311018c0e1 100644 (file)
--- a/arch/x86_64/pthread_arch.h
+++ b/arch/x86_64/pthread_arch.h
@@ -7,4 +7,4 @@ static inline struct pthread *__pthread_self()
 
 #define TP_ADJ(p) (p)
 
-#define CANCEL_REG_IP 16
+#define MC_PC gregs[REG_RIP]

diff --git a/src/thread/pthread_cancel.c b/src/thread/pthread_cancel.c
index 0151a1ae5f93fba0d322dbea4f259ea0b899dddf..6eaf72c45c90e82b9e4bbe5bc2314111d39bc977 100644 (file)
--- a/src/thread/pthread_cancel.c
+++ b/src/thread/pthread_cancel.c
@@ -1,3 +1,4 @@
+#define _GNU_SOURCE
 #include <string.h>
 #include "pthread_impl.h"
 #include "syscall.h"
@@ -61,15 +62,15 @@ static void cancel_handler(int sig, siginfo_t *si, void *ctx)
 {
        pthread_t self = __pthread_self();
        ucontext_t *uc = ctx;
-       const char *ip = ((char **)&uc->uc_mcontext)[CANCEL_REG_IP];
+       uintptr_t pc = uc->uc_mcontext.MC_PC;
 
        a_barrier();
        if (!self->cancel || self->canceldisable == PTHREAD_CANCEL_DISABLE) return;
 
        _sigaddset(&uc->uc_sigmask, SIGCANCEL);
 
-       if (self->cancelasync || ip >= __cp_begin && ip < __cp_end) {
-               ((char **)&uc->uc_mcontext)[CANCEL_REG_IP] = (char *)__cp_cancel;
+       if (self->cancelasync || pc >= (uintptr_t)__cp_begin && pc < (uintptr_t)__cp_end) {
+               uc->uc_mcontext.MC_PC = (uintptr_t)__cp_cancel;
                return;
        }