zenithsiz/ftmemsim-valgrind
1
0
Fork 0
mirror of https://github.com/Zenithsiz/ftmemsim-valgrind.git synced 2026-02-10 05:37:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sys_statx: don't complain if both |filename| and |buf| are NULL.

Browse Source 
So as to work around the Rust library's dubious use of statx.
This commit is contained in:
Julian Seward
2020-01-02 14:27:24 +01:00
parent cadd909935
commit 2a7d3ae768
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
coregrind/m_syswrap/syswrap-linux.c
View File

@@ -3692,10 +3692,19 @@ PRE(sys_statx)
PRINT("sys_statx ( %ld, %#" FMT_REGWORD "x(%s), %ld, %ld, %#" FMT_REGWORD "x )",
(Word)ARG1,ARG2,(char*)(Addr)ARG2,(Word)ARG3,(Word)ARG4,ARG5);
PRE_REG_READ5(long, "statx",
int, dirfd, char *, file_name, int, flags,
int, dirfd, char *, filename, int, flags,
unsigned int, mask, struct statx *, buf);
PRE_MEM_RASCIIZ( "statx(file_name)", ARG2 );
PRE_MEM_WRITE( "statx(buf)", ARG5, sizeof(struct vki_statx) );
// Work around Rust's dubious use of statx, as described here:
// https://github.com/rust-lang/rust/blob/
// ccd238309f9dce92a05a23c2959e2819668c69a4/
// src/libstd/sys/unix/fs.rs#L128-L142
// in which it passes NULL for both filename and buf, and then looks at the
// return value, so as to determine whether or not this syscall is supported.
Bool both_filename_and_buf_are_null = ARG2 == 0 && ARG5 == 0;
if (!both_filename_and_buf_are_null) {
PRE_MEM_RASCIIZ( "statx(filename)", ARG2 );
PRE_MEM_WRITE( "statx(buf)", ARG5, sizeof(struct vki_statx) );
}
}
POST(sys_statx)
{