zenithsiz/ftmemsim-valgrind
1
0
Fork 0
mirror of https://github.com/Zenithsiz/ftmemsim-valgrind.git synced 2026-02-03 18:13:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mips64: use getdents() if getdents64() is not available

Browse Source 
The MIPS64 getdents64() system call is only present in 3.10+ kernels.
If the getdents64() system call is not available fall back to using
getdents() and modify the result to be compatible with getdents64().
This matters only when --track-fds=yes is set.

This change fixes none/tests/fdleak* failures on MIPS64 platforms with
kernel versions older than 3.10.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15778
This commit is contained in:
Petar Jovanovic 2016-01-29 17:47:43 +00:00
parent 696487740c
commit 525050c47a
1 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
coregrind/m_libcfile.c
View File

@ -667,6 +667,38 @@ Int VG_(getdents64) (Int fd, struct vki_dirent64 *dirp, UInt count)
res = VG_(do_syscall3)(__NR_getdents, fd, (UWord)dirp, count);
# else
res = VG_(do_syscall3)(__NR_getdents64, fd, (UWord)dirp, count);
# if defined(VGA_mips64)
/* The MIPS64 getdents64() system call is only present in 3.10+ kernels.
If the getdents64() system call is not available fall back to using
getdents() and modify the result to be compatible with getdents64(). */
if (sr_isError(res) && (sr_Err(res) == VKI_ENOSYS)) {
int r;
res = VG_(do_syscall3)(__NR_getdents, fd, (UWord)dirp, count);
r = sr_Res(res);
if (r > 0) {
char *p;
char type;
union dirents {
struct vki_dirent m;
struct vki_dirent64 d;
} *u;
p = (char *)dirp;
do {
u = (union dirents *)p;
/* This should not happen, but just in case... */
if (p + u->m.d_reclen > (char *)dirp + r)
break;
/* shuffle the dirent */
type = *(p + u->m.d_reclen - 1);
VG_(memmove)(u->d.d_name, u->m.d_name,
u->m.d_reclen - 2
- offsetof(struct vki_dirent, d_name) + 1);
u->d.d_type = type;
p += u->m.d_reclen;
} while (p < (char *)dirp + r);
}
}
# endif
# endif
return sr_isError(res) ? -1 : sr_Res(res);
}