PR20333/finit_module

diff --git a/tapset/linux/nd_syscalls.stp b/tapset/linux/nd_syscalls.stp
index 37f19e5f944b2f1c6c51fefe91d975df781321dc..d10b3a0b1fc14376e6fbbaadab3a4546744d6d86 100644 (file)
--- a/tapset/linux/nd_syscalls.stp
+++ b/tapset/linux/nd_syscalls.stp
@@ -1,26 +1,4 @@
 
-# finit_module ________________________________________________
-# SYSCALL_DEFINE3(finit_module, int, fd, const char __user *, uargs,
-#                int, flags)
-#
-probe nd_syscall.finit_module = kprobe.function("sys_finit_module").call ?
-{
-       name = "finit_module"
-       asmlinkage()
-       fd = int_arg(1)
-       uargs = user_string_quoted(pointer_arg(2))
-       flags = int_arg(3)
-       flags_str = _finit_module_flags_str(flags)
-       argstr = sprintf("%d, %s, %s", fd, uargs,
-                        _finit_module_flags_str(flags))
-}
-probe nd_syscall.finit_module.return =
-       kprobe.function("sys_finit_module").return ?
-{
-       name = "finit_module"
-       retstr = returnstr(1)
-}
-
 
 # flistxattr _________________________________________________
 # ssize_t sys_flistxattr(int fd, char __user *list, size_t size)

diff --git a/tapset/linux/sysc_finit_module.stp b/tapset/linux/sysc_finit_module.stp
new file mode 100644 (file)
index 0000000..a323c11
--- /dev/null
+++ b/tapset/linux/sysc_finit_module.stp
@@ -0,0 +1,53 @@
+# finit_module ________________________________________________
+# SYSCALL_DEFINE3(finit_module, int, fd, const char __user *, uargs,
+#                int, flags)
+#
+
+@define _SYSCALL_FINIT_MODULE_NAME
+%(
+       name = "finit_module"
+%)
+
+@define _SYSCALL_FINIT_MODULE_ARGSTR
+%(
+       argstr = sprintf("%d, %s, %s", fd, uargs, flags_str)
+%)
+
+probe syscall.finit_module = dw_syscall.finit_module !, nd_syscall.finit_module {}
+probe syscall.finit_module.return = dw_syscall.finit_module.return !, nd_syscall.finit_module.return {}
+
+# dw_finit_module _____________________________________________________
+
+probe dw_syscall.finit_module = kernel.function("sys_finit_module").call ?
+{
+       @_SYSCALL_FINIT_MODULE_NAME
+       fd = __int32($fd)
+       uargs = user_string_quoted($uargs)
+       flags = __int32($flags)
+       flags_str = _finit_module_flags_str(__int32($flags))
+       @_SYSCALL_FINIT_MODULE_ARGSTR
+}
+probe dw_syscall.finit_module.return = kernel.function("sys_finit_module").return ?
+{
+       @_SYSCALL_FINIT_MODULE_NAME
+       retstr = return_str(1, $return)
+}
+
+# nd_finit_module _____________________________________________________
+
+probe nd_syscall.finit_module = kprobe.function("sys_finit_module").call ?
+{
+       @_SYSCALL_FINIT_MODULE_NAME
+       asmlinkage()
+       fd = int_arg(1)
+       uargs = user_string_quoted(pointer_arg(2))
+       flags = int_arg(3)
+       flags_str = _finit_module_flags_str(flags)
+       @_SYSCALL_FINIT_MODULE_ARGSTR
+}
+probe nd_syscall.finit_module.return =
+       kprobe.function("sys_finit_module").return ?
+{
+       @_SYSCALL_FINIT_MODULE_NAME
+       retstr = returnstr(1)
+}

diff --git a/tapset/linux/syscalls.stp b/tapset/linux/syscalls.stp
index 40fc483758f053f48e5fc0197f2998afa7020d9b..a3549235b9f5e8aa222a02ea22898b00924f4c00 100644 (file)
--- a/tapset/linux/syscalls.stp
+++ b/tapset/linux/syscalls.stp
@@ -1,25 +1,4 @@
 
-# finit_module ________________________________________________
-# SYSCALL_DEFINE3(finit_module, int, fd, const char __user *, uargs,
-#                int, flags)
-#
-probe syscall.finit_module = kernel.function("sys_finit_module").call ?
-{
-       name = "finit_module"
-       fd = __int32($fd)
-       uargs = user_string_quoted($uargs)
-       flags = __int32($flags)
-       flags_str = _finit_module_flags_str(__int32($flags))
-       argstr = sprintf("%d, %s, %s", __int32($fd),
-                        user_string_quoted($uargs),
-                        _finit_module_flags_str(__int32($flags)))
-}
-probe syscall.finit_module.return = kernel.function("sys_finit_module").return ?
-{
-       name = "finit_module"
-       retstr = return_str(1, $return)
-}
-
 # flistxattr _________________________________________________
 # ssize_t sys_flistxattr(int fd, char __user *list, size_t size)
 probe syscall.flistxattr = kernel.function("sys_flistxattr").call