PR20333/linkat

diff --git a/tapset/linux/nd_syscalls.stp b/tapset/linux/nd_syscalls.stp
index 0a4fd8388476fcde79d9110839fc4c39a80a87cb..f116c5cd46036f96b3daa857e2ecfe25b02d0b0e 100644 (file)
--- a/tapset/linux/nd_syscalls.stp
+++ b/tapset/linux/nd_syscalls.stp
@@ -1,33 +1,4 @@
 
-# linkat _____________________________________________________
-# new function with 2.6.16
-# long sys_linkat(int olddfd, const char __user *oldname,
-#      int newdfd, const char __user *newname, int flags)
-probe nd_syscall.linkat = kprobe.function("sys_linkat") ?
-{
-       @__syscall_compat_gate(@const("__NR_linkat"), @const("__NR_compat_linkat"))
-       name = "linkat"
-       asmlinkage()
-       olddirfd = int_arg(1)
-       olddirfd_str = _dfd_str(olddirfd)
-       oldpath = user_string_quoted(pointer_arg(2))
-       newdirfd = int_arg(3)
-       newdirfd_str = _dfd_str(newdirfd)
-       newpath = user_string_quoted(pointer_arg(4))
-       flags = int_arg(5)
-       flags_str = _at_flag_str(flags)
-       argstr = sprintf("%s, %s, %s, %s, %s",
-               olddirfd_str, user_string_quoted(pointer_arg(2)),
-               newdirfd_str, user_string_quoted(pointer_arg(4)),
-               flags_str)
-}
-probe nd_syscall.linkat.return = kprobe.function("sys_linkat").return ?
-{
-       @__syscall_compat_gate(@const("__NR_linkat"), @const("__NR_compat_linkat"))
-       name = "linkat"
-       retstr = returnstr(1)
-}
-
 # listen _____________________________________________________
 # long sys_listen(int fd, int backlog)
 probe nd_syscall.listen = __nd_syscall.listen ?,

diff --git a/tapset/linux/sysc_linkat.stp b/tapset/linux/sysc_linkat.stp
new file mode 100644 (file)
index 0000000..8c3cf43
--- /dev/null
+++ b/tapset/linux/sysc_linkat.stp
@@ -0,0 +1,65 @@
+# linkat _____________________________________________________
+# new function with 2.6.16
+# long sys_linkat(int olddfd, const char __user *oldname,
+#      int newdfd, const char __user *newname, int flags)
+
+@define _SYSCALL_LINKAT_NAME
+%(
+       name = "linkat"
+%)
+
+@define _SYSCALL_LINKAT_ARGSTR
+%(
+       argstr = sprintf("%s, %s, %s, %s, %s", olddirfd_str, oldpath,
+                        newdirfd_str, newpath, flags_str)
+%)
+
+probe syscall.linkat = dw_syscall.linkat !, nd_syscall.linkat {}
+probe syscall.linkat.return = dw_syscall.linkat.return !, nd_syscall.linkat.return {}
+
+# dw_linkat _____________________________________________________
+
+probe dw_syscall.linkat = kernel.function("sys_linkat").call ?
+{
+       @__syscall_compat_gate(@const("__NR_linkat"), @const("__NR_compat_linkat"))
+       @_SYSCALL_LINKAT_NAME
+       olddirfd = __int32($olddfd)
+       olddirfd_str = _dfd_str(__int32($olddfd))
+       oldpath = user_string_quoted($oldname)
+       newdirfd = __int32($newdfd)
+       newdirfd_str = _dfd_str(__int32($newdfd))
+       newpath = user_string_quoted($newname)
+       flags = __int32($flags)
+       flags_str = _at_flag_str(__int32($flags))
+       @_SYSCALL_LINKAT_ARGSTR
+}
+probe dw_syscall.linkat.return = kernel.function("sys_linkat").return ?
+{
+       @__syscall_compat_gate(@const("__NR_linkat"), @const("__NR_compat_linkat"))
+       @_SYSCALL_LINKAT_NAME
+       retstr = return_str(1, $return)
+}
+
+# nd_linkat _____________________________________________________
+
+probe nd_syscall.linkat = kprobe.function("sys_linkat") ?
+{
+       @__syscall_compat_gate(@const("__NR_linkat"), @const("__NR_compat_linkat"))
+       @_SYSCALL_LINKAT_NAME
+       asmlinkage()
+       olddirfd = int_arg(1)
+       olddirfd_str = _dfd_str(olddirfd)
+       oldpath = user_string_quoted(pointer_arg(2))
+       newdirfd = int_arg(3)
+       newdirfd_str = _dfd_str(newdirfd)
+       newpath = user_string_quoted(pointer_arg(4))
+       flags = int_arg(5)
+       flags_str = _at_flag_str(flags)
+       @_SYSCALL_LINKAT_ARGSTR
+}
+probe nd_syscall.linkat.return = kprobe.function("sys_linkat").return ?
+{
+       @__syscall_compat_gate(@const("__NR_linkat"), @const("__NR_compat_linkat"))
+       @_SYSCALL_LINKAT_NAME
+       retstr = returnstr(1)
+}

diff --git a/tapset/linux/syscalls.stp b/tapset/linux/syscalls.stp
index 8d6d47130b020d5c4589f48416717dee5eccd3a9..140d4bc294d84011f0a11339620f5b5787cfb192 100644 (file)
--- a/tapset/linux/syscalls.stp
+++ b/tapset/linux/syscalls.stp
@@ -1,32 +1,4 @@
 
-# linkat _____________________________________________________
-# new function with 2.6.16
-# long sys_linkat(int olddfd, const char __user *oldname,
-#      int newdfd, const char __user *newname, int flags)
-probe syscall.linkat = kernel.function("sys_linkat").call ?
-{
-       @__syscall_compat_gate(@const("__NR_linkat"), @const("__NR_compat_linkat"))
-       name = "linkat"
-       olddirfd = __int32($olddfd)
-       olddirfd_str = _dfd_str(__int32($olddfd))
-       oldpath = user_string_quoted($oldname)
-       newdirfd = __int32($newdfd)
-       newdirfd_str = _dfd_str(__int32($newdfd))
-       newpath = user_string_quoted($newname)
-       flags = __int32($flags)
-       flags_str = _at_flag_str(__int32($flags))
-       argstr = sprintf("%s, %s, %s, %s, %s",
-                        olddirfd_str, user_string_quoted($oldname),
-                        newdirfd_str, user_string_quoted($newname),
-                        flags_str)
-}
-probe syscall.linkat.return = kernel.function("sys_linkat").return ?
-{
-       @__syscall_compat_gate(@const("__NR_linkat"), @const("__NR_compat_linkat"))
-       name = "linkat"
-       retstr = return_str(1, $return)
-}
-
 # listen _____________________________________________________
 # long sys_listen(int fd, int backlog)
 probe syscall.listen = __syscall.listen ?, __syscall.socketcall.listen ?,