fix stack protector crashes on x32 & powerpc due to misplaced TLS canary

[musl] / arch / arm / syscall_arch.h

diff --git a/arch/arm/syscall_arch.h b/arch/arm/syscall_arch.h
index f50c3b4..199ad2a 100644 (file)
--- a/arch/arm/syscall_arch.h
+++ b/arch/arm/syscall_arch.h
@@ -3,10 +3,6 @@
 ((union { long long ll; long l[2]; }){ .ll = x }).l[1]
 #define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x))
 
-#define __SYSCALL_SSLEN 8
-
-#ifndef __clang__
-
 #define __asm_syscall(...) do { \
        __asm__ __volatile__ ( "svc 0" \
        : "=r"(r0) : __VA_ARGS__ : "memory"); \
@@ -54,41 +50,25 @@ static inline long __syscall4(long n, long a, long b, long c, long d)
        __asm_syscall("r"(r7), "0"(r0), "r"(r1), "r"(r2), "r"(r3));
 }
 
-#else
-
-static inline long __syscall0(long n)
-{
-       return (__syscall)(n);
-}
-
-static inline long __syscall1(long n, long a)
-{
-       return (__syscall)(n, a);
-}
-
-static inline long __syscall2(long n, long a, long b)
-{
-       return (__syscall)(n, a, b);
-}
-
-static inline long __syscall3(long n, long a, long b, long c)
-{
-       return (__syscall)(n, a, b, c);
-}
-
-static inline long __syscall4(long n, long a, long b, long c, long d)
-{
-       return (__syscall)(n, a, b, c, d);
-}
-
-#endif
-
 static inline long __syscall5(long n, long a, long b, long c, long d, long e)
 {
-       return (__syscall)(n, a, b, c, d, e);
+       register long r7 __asm__("r7") = n;
+       register long r0 __asm__("r0") = a;
+       register long r1 __asm__("r1") = b;
+       register long r2 __asm__("r2") = c;
+       register long r3 __asm__("r3") = d;
+       register long r4 __asm__("r4") = e;
+       __asm_syscall("r"(r7), "0"(r0), "r"(r1), "r"(r2), "r"(r3), "r"(r4));
 }
 
 static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f)
 {
-       return (__syscall)(n, a, b, c, d, e, f);
+       register long r7 __asm__("r7") = n;
+       register long r0 __asm__("r0") = a;
+       register long r1 __asm__("r1") = b;
+       register long r2 __asm__("r2") = c;
+       register long r3 __asm__("r3") = d;
+       register long r4 __asm__("r4") = e;
+       register long r5 __asm__("r5") = f;
+       __asm_syscall("r"(r7), "0"(r0), "r"(r1), "r"(r2), "r"(r3), "r"(r4), "r"(r5));
 }