RepoMirrors
/
musl
mirror of git://git.musl-libc.org/musl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix some issues in x32 syscall_cp_fixup 

- the nanosleep fixup "fixed" the second timespec* argument erroneusly.
- the futex fixup was missing the check for FUTEX_WAIT.
- general cleanup using a macro.
This commit is contained in:
rofl0r 2014-02-23 16:36:43 +01:00
parent d8b587796f
commit e002f660b8
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arch/x32/src/syscall_cp_fixup.c
View File

@ -5,28 +5,25 @@ long __syscall_cp_internal(volatile void*, long long, long long, long long, long
struct __timespec { long long tv_sec; long tv_nsec; }; struct __timespec { long long tv_sec; long tv_nsec; };
struct __timespec_kernel { long long tv_sec; long long tv_nsec; }; struct __timespec_kernel { long long tv_sec; long long tv_nsec; };
#define __tsc(X) ((struct __timespec*)(unsigned long)(X)) #define __tsc(X) ((struct __timespec*)(unsigned long)(X))
#define __fixup(X) do { if(X) X = (unsigned long) (&(struct __timespec_kernel) \
{ .tv_sec = __tsc(X)->tv_sec, .tv_nsec = __tsc(X)->tv_nsec}); } while(0)
long __syscall_cp_asm (volatile void * foo, long long n, long long a1, long long a2, long long a3, long __syscall_cp_asm (volatile void * foo, long long n, long long a1, long long a2, long long a3,
long long a4, long long a5, long long a6) { long long a4, long long a5, long long a6) {
switch (n) { switch (n) {
case SYS_mq_timedsend: case SYS_mq_timedreceive: case SYS_pselect6: case SYS_mq_timedsend: case SYS_mq_timedreceive: case SYS_pselect6:
if(a5) a5 = (unsigned long) (&(struct __timespec_kernel) { __fixup(a5);
.tv_sec = __tsc(a5)->tv_sec, .tv_nsec = __tsc(a5)->tv_nsec});
break; break;
case SYS_futex: case SYS_futex:
if(a4) a4 = (unsigned long) (&(struct __timespec_kernel) { if((a2 & (~128 /* FUTEX_PRIVATE_FLAG */)) == 0 /* FUTEX_WAIT */)
.tv_sec = __tsc(a4)->tv_sec, .tv_nsec = __tsc(a4)->tv_nsec}); __fixup(a4);
if(n == SYS_futex) break; break;
case SYS_clock_nanosleep: case SYS_clock_nanosleep:
case SYS_rt_sigtimedwait: case SYS_ppoll: case SYS_rt_sigtimedwait: case SYS_ppoll:
if(a3) a3 = (unsigned long) (&(struct __timespec_kernel) { __fixup(a3);
.tv_sec = __tsc(a3)->tv_sec, .tv_nsec = __tsc(a3)->tv_nsec});
break; break;
case SYS_nanosleep: case SYS_nanosleep:
if(a1) a1 = (unsigned long) (&(struct __timespec_kernel) { __fixup(a1);
.tv_sec = __tsc(a1)->tv_sec, .tv_nsec = __tsc(a1)->tv_nsec});
if(a2) a2 = (unsigned long) (&(struct __timespec_kernel) {
.tv_sec = __tsc(a2)->tv_sec, .tv_nsec = __tsc(a2)->tv_nsec});
break; break;
} }
return __syscall_cp_internal(foo, n, a1, a2, a3, a4, a5, a6); return __syscall_cp_internal(foo, n, a1, a2, a3, a4, a5, a6);