提交 4f695946 编写于 作者: R Rich Felker

fix dangling pointers in x32 syscall timespec fixup code

the lifetime of compound literals is the block in which they appear.
the temporary struct __timespec_kernel objects created as compound
literals no longer existed at the time their addresses were passed to
the kernel.
上级 7561ac45
...@@ -9,14 +9,18 @@ long __syscall_cp_internal(volatile void*, long long, long long, long long, long ...@@ -9,14 +9,18 @@ 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) \ #define __fixup(X) do { if(X) { \
{ .tv_sec = __tsc(X)->tv_sec, .tv_nsec = __tsc(X)->tv_nsec}); } while(0) ts->tv_sec = __tsc(X)->tv_sec; \
ts->tv_nsec = __tsc(X)->tv_nsec; \
(X) = (unsigned long)ts; } } while(0)
#ifdef SHARED #ifdef SHARED
__attribute__((__visibility__("hidden"))) __attribute__((__visibility__("hidden")))
#endif #endif
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)
{
struct __timespec_kernel ts[1];
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:
__fixup(a5); __fixup(a5);
......
...@@ -6,8 +6,10 @@ typedef long long syscall_arg_t; ...@@ -6,8 +6,10 @@ typedef long long syscall_arg_t;
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) \ #define __fixup(X) do { if(X) { \
{ .tv_sec = __tsc(X)->tv_sec, .tv_nsec = __tsc(X)->tv_nsec}); } while(0) ts->tv_sec = __tsc(X)->tv_sec; \
ts->tv_nsec = __tsc(X)->tv_nsec; \
(X) = (unsigned long)ts; } } while(0)
#define __fixup_case_2 \ #define __fixup_case_2 \
case SYS_nanosleep: \ case SYS_nanosleep: \
__fixup(a1); break; \ __fixup(a1); break; \
...@@ -17,10 +19,13 @@ struct __timespec_kernel { long long tv_sec; long long tv_nsec; }; ...@@ -17,10 +19,13 @@ struct __timespec_kernel { long long tv_sec; long long tv_nsec; };
case SYS_clock_nanosleep: case SYS_rt_sigtimedwait: case SYS_ppoll: \ case SYS_clock_nanosleep: case SYS_rt_sigtimedwait: case SYS_ppoll: \
__fixup(a3); break; \ __fixup(a3); break; \
case SYS_utimensat: \ case SYS_utimensat: \
if(a3) a3 = (unsigned long) ((struct __timespec_kernel[2]) { \ if(a3) { \
[0] = {.tv_sec = __tsc(a3)[0].tv_sec, .tv_nsec = __tsc(a3)[0].tv_nsec}, \ ts[0].tv_sec = __tsc(a3)[0].tv_sec; \
[1] = {.tv_sec = __tsc(a3)[1].tv_sec, .tv_nsec = __tsc(a3)[1].tv_nsec}, \ ts[0].tv_nsec = __tsc(a3)[0].tv_nsec; \
}); break; ts[1].tv_sec = __tsc(a3)[1].tv_sec; \
ts[1].tv_nsec = __tsc(a3)[1].tv_nsec; \
a3 = (unsigned long)ts; \
} break;
#define __fixup_case_4 \ #define __fixup_case_4 \
case SYS_futex: \ case SYS_futex: \
if((a2 & (~128 /* FUTEX_PRIVATE_FLAG */)) == 0 /* FUTEX_WAIT */) __fixup(a4); break; if((a2 & (~128 /* FUTEX_PRIVATE_FLAG */)) == 0 /* FUTEX_WAIT */) __fixup(a4); break;
...@@ -45,7 +50,7 @@ static __inline long __syscall1(long long n, long long a1) ...@@ -45,7 +50,7 @@ static __inline long __syscall1(long long n, long long a1)
static __inline long __syscall2(long long n, long long a1, long long a2) static __inline long __syscall2(long long n, long long a1, long long a2)
{ {
unsigned long ret; unsigned long ret;
struct __timespec *ts2 = 0; struct __timespec_kernel ts[1];
switch (n) { switch (n) {
__fixup_case_2; __fixup_case_2;
} }
...@@ -57,6 +62,7 @@ static __inline long __syscall2(long long n, long long a1, long long a2) ...@@ -57,6 +62,7 @@ static __inline long __syscall2(long long n, long long a1, long long a2)
static __inline long __syscall3(long long n, long long a1, long long a2, long long a3) static __inline long __syscall3(long long n, long long a1, long long a2, long long a3)
{ {
unsigned long ret; unsigned long ret;
struct __timespec_kernel ts[2];
switch (n) { switch (n) {
__fixup_case_2; __fixup_case_2;
__fixup_case_3; __fixup_case_3;
...@@ -71,6 +77,7 @@ static __inline long __syscall4(long long n, long long a1, long long a2, long lo ...@@ -71,6 +77,7 @@ static __inline long __syscall4(long long n, long long a1, long long a2, long lo
{ {
unsigned long ret; unsigned long ret;
register long long a4 __asm__("r10") = a4_; register long long a4 __asm__("r10") = a4_;
struct __timespec_kernel ts[2];
switch (n) { switch (n) {
__fixup_case_2; __fixup_case_2;
__fixup_case_3; __fixup_case_3;
...@@ -87,6 +94,7 @@ static __inline long __syscall5(long long n, long long a1, long long a2, long lo ...@@ -87,6 +94,7 @@ static __inline long __syscall5(long long n, long long a1, long long a2, long lo
unsigned long ret; unsigned long ret;
register long long a4 __asm__("r10") = a4_; register long long a4 __asm__("r10") = a4_;
register long long a5 __asm__("r8") = a5_; register long long a5 __asm__("r8") = a5_;
struct __timespec_kernel ts[2];
switch (n) { switch (n) {
__fixup_case_2; __fixup_case_2;
__fixup_case_3; __fixup_case_3;
...@@ -105,6 +113,7 @@ static __inline long __syscall6(long long n, long long a1, long long a2, long lo ...@@ -105,6 +113,7 @@ static __inline long __syscall6(long long n, long long a1, long long a2, long lo
register long long a4 __asm__("r10") = a4_; register long long a4 __asm__("r10") = a4_;
register long long a5 __asm__("r8") = a5_; register long long a5 __asm__("r8") = a5_;
register long long a6 __asm__("r9") = a6_; register long long a6 __asm__("r9") = a6_;
struct __timespec_kernel ts[2];
switch (n) { switch (n) {
__fixup_case_2; __fixup_case_2;
__fixup_case_3; __fixup_case_3;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册