Add support for sys_kcmp. Patch from Chris Jones

(cjones.bugs@gmail.com).  Fixes #338106.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14451

diff --git a/coregrind/m_syswrap/priv_syswrap-linux.h b/coregrind/m_syswrap/priv_syswrap-linux.h
index 0bdf6609486a2db0414cea3628caab0b2124f84a..40c43a0ed041bc521fa6ebfe30c7b0f024f716cf 100644 (file)
--- a/coregrind/m_syswrap/priv_syswrap-linux.h
+++ b/coregrind/m_syswrap/priv_syswrap-linux.h
@@ -352,7 +352,7 @@ DECL_TEMPLATE(linux, sys_listen);
 DECL_TEMPLATE(linux, sys_getsockname);
 DECL_TEMPLATE(linux, sys_getpeername);
 DECL_TEMPLATE(linux, sys_socketpair);
-
+DECL_TEMPLATE(linux, sys_kcmp);
 
 #endif   // __PRIV_SYSWRAP_LINUX_H
 

diff --git a/coregrind/m_syswrap/syswrap-amd64-linux.c b/coregrind/m_syswrap/syswrap-amd64-linux.c
index 02d5a469b63c085d9cea9d118996d4f07de46adf..5999270d3df0ef674430cf793f5a067687b5ef4d 100644 (file)
--- a/coregrind/m_syswrap/syswrap-amd64-linux.c
+++ b/coregrind/m_syswrap/syswrap-amd64-linux.c
@@ -1060,7 +1060,8 @@ static SyscallTableEntry syscall_table[] = {
    LINXY(__NR_getcpu,            sys_getcpu),           // 309
 
    LINXY(__NR_process_vm_readv,  sys_process_vm_readv), // 310
-   LINX_(__NR_process_vm_writev, sys_process_vm_writev) // 311
+   LINX_(__NR_process_vm_writev, sys_process_vm_writev),// 311
+   LINX_(__NR_kcmp,              sys_kcmp)              // 312
 };
 
 SyscallTableEntry* ML_(get_linux_syscall_entry) ( UInt sysno )

diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
index a4b64a8572039362843f0a83e5add9f5a24c5035..4a2c092aa9c19fab83ffacab879fd4d2f571aeeb 100644 (file)
--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -8606,6 +8606,14 @@ ML_(linux_POST_getregset) ( ThreadId tid, long arg3, long arg4 )
    POST_MEM_WRITE((unsigned long) iov->iov_base, iov->iov_len);
 }
 
+PRE(sys_kcmp)
+{
+   PRINT("kcmp ( %ld, %ld, %ld, %lu, %lu )", ARG1, ARG1, ARG3, ARG4, ARG5);
+   PRE_REG_READ5(long, "kcmp",
+                 vki_pid_t, pid1, vki_pid_t, pid2, int, type,
+                 unsigned long, idx1, unsigned long, idx2);
+}
+
 #undef PRE
 #undef POST
 

diff --git a/coregrind/m_syswrap/syswrap-x86-linux.c b/coregrind/m_syswrap/syswrap-x86-linux.c
index 2ec4d1ae720851deac2499a93fb4cbd7ba170246..c51a9f4c52def31cd322ad3d40fe19853e55f6ea 100644 (file)
--- a/coregrind/m_syswrap/syswrap-x86-linux.c
+++ b/coregrind/m_syswrap/syswrap-x86-linux.c
@@ -1812,7 +1812,8 @@ static SyscallTableEntry syscall_table[] = {
    LINXY(__NR_sendmmsg,          sys_sendmmsg),         // 345
 //   LINX_(__NR_setns,             sys_ni_syscall),       // 346
    LINXY(__NR_process_vm_readv,  sys_process_vm_readv), // 347
-   LINX_(__NR_process_vm_writev, sys_process_vm_writev) // 348
+   LINX_(__NR_process_vm_writev, sys_process_vm_writev),// 348
+   LINX_(__NR_kcmp,              sys_kcmp)              // 349
 };
 
 SyscallTableEntry* ML_(get_linux_syscall_entry) ( UInt sysno )

diff --git a/include/vki/vki-scnums-amd64-linux.h b/include/vki/vki-scnums-amd64-linux.h
index 9d0b1eaef4a2ad9fa40b236bcbcfc06689293a97..d5a11f81d25661f41cec07056304ef4c665644dc 100644 (file)
--- a/include/vki/vki-scnums-amd64-linux.h
+++ b/include/vki/vki-scnums-amd64-linux.h
@@ -393,6 +393,7 @@
 #define __NR_getcpu             309
 #define __NR_process_vm_readv   310
 #define __NR_process_vm_writev  311
+#define __NR_kcmp               312
 
 #endif /* __VKI_SCNUMS_AMD64_LINUX_H */
 

diff --git a/include/vki/vki-scnums-x86-linux.h b/include/vki/vki-scnums-x86-linux.h
index ad7c4245330e21d0ee0d289f96dccc0c51e42daa..b99f0fa012d82926567d63cf2de77e6ed94e3dea 100644 (file)
--- a/include/vki/vki-scnums-x86-linux.h
+++ b/include/vki/vki-scnums-x86-linux.h
@@ -383,6 +383,7 @@
 #define __NR_setns             346
 #define __NR_process_vm_readv   347
 #define __NR_process_vm_writev  348
+#define __NR_kcmp               349
 
 #endif /* __VKI_SCNUMS_X86_LINUX_H */