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

fix possible clobbering of syscall return values on mips 

depending on the compiler's interpretation of __asm__ register names
for register class objects, it may be possible for the return value in
r2 to be clobbered by the function call to __stat_fix. I have not
observed any such breakage in normal builds and suspect it only
happens with -O0 or other unusual build options, but since there's an
ambiguity as to the semantics of this feature, it's best to use an
explicit temporary to avoid the issue.

based on reporting and patch by Eugene.
This commit is contained in:
Rich Felker 2015-04-07 12:47:19 -04:00
parent 05e0e301e3
commit 25748db301
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/mips/syscall_arch.h
View File

@ -60,8 +60,9 @@ static inline long __syscall2(long n, long a, long b)
: "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13",
"$14", "$15", "$24", "$25", "hi", "lo", "memory"); "$14", "$15", "$24", "$25", "hi", "lo", "memory");
if (r7) return -r2; if (r7) return -r2;
long ret = r2;
if (n == SYS_stat64 || n == SYS_fstat64 || n == SYS_lstat64) __stat_fix(b); if (n == SYS_stat64 || n == SYS_fstat64 || n == SYS_lstat64) __stat_fix(b);
return r2; return ret;
} }
static inline long __syscall3(long n, long a, long b, long c) static inline long __syscall3(long n, long a, long b, long c)
@ -78,8 +79,9 @@ static inline long __syscall3(long n, long a, long b, long c)
: "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13",
"$14", "$15", "$24", "$25", "hi", "lo", "memory"); "$14", "$15", "$24", "$25", "hi", "lo", "memory");
if (r7) return -r2; if (r7) return -r2;
long ret = r2;
if (n == SYS_stat64 || n == SYS_fstat64 || n == SYS_lstat64) __stat_fix(b); if (n == SYS_stat64 || n == SYS_fstat64 || n == SYS_lstat64) __stat_fix(b);
return r2; return ret;
} }
static inline long __syscall4(long n, long a, long b, long c, long d) static inline long __syscall4(long n, long a, long b, long c, long d)
@ -96,9 +98,10 @@ static inline long __syscall4(long n, long a, long b, long c, long d)
: "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13",
"$14", "$15", "$24", "$25", "hi", "lo", "memory"); "$14", "$15", "$24", "$25", "hi", "lo", "memory");
if (r7) return -r2; if (r7) return -r2;
long ret = r2;
if (n == SYS_stat64 || n == SYS_fstat64 || n == SYS_lstat64) __stat_fix(b); if (n == SYS_stat64 || n == SYS_fstat64 || n == SYS_lstat64) __stat_fix(b);
if (n == SYS_fstatat) __stat_fix(c); if (n == SYS_fstatat) __stat_fix(c);
return r2; return ret;
} }
#else #else