PR20333/setresgid16

diff --git a/tapset/linux/nd_syscalls2.stp b/tapset/linux/nd_syscalls2.stp
index 73d355270a0f9364ac3e6c8f878689bc8a8d12b8..dc8d6fe919a02347e27530974c5503d10d6b86bf 100644 (file)
--- a/tapset/linux/nd_syscalls2.stp
+++ b/tapset/linux/nd_syscalls2.stp
@@ -1,25 +1,4 @@
 
-# setresgid16 ________________________________________________
-#
-# long sys_setresgid16(old_gid_t rgid,
-#                   old_gid_t egid,
-#                   old_gid_t sgid)
-#
-probe nd_syscall.setresgid16 = kprobe.function("sys_setresgid16") ?
-{
-       name = "setresgid"
-       asmlinkage()
-       rgid = __short(uint_arg(1))
-       egid = __short(uint_arg(2))
-       sgid = __short(uint_arg(3))
-       argstr = sprintf("%d, %d, %d", rgid, egid, sgid)
-}
-probe nd_syscall.setresgid16.return = kprobe.function("sys_setresgid16").return ?
-{
-       name = "setresgid16"
-       retstr = returnstr(1)
-}
-
 # setresuid __________________________________________________
 #
 # long sys_setresuid(uid_t ruid, uid_t euid, uid_t suid)

diff --git a/tapset/linux/sysc_setresgid16.stp b/tapset/linux/sysc_setresgid16.stp
new file mode 100644 (file)
index 0000000..91b1a98
--- /dev/null
+++ b/tapset/linux/sysc_setresgid16.stp
@@ -0,0 +1,52 @@
+# setresgid16 ________________________________________________
+#
+# long sys_setresgid16(old_gid_t rgid,
+#                   old_gid_t egid,
+#                   old_gid_t sgid)
+#
+
+@define _SYSCALL_SETRESGID16_NAME
+%(
+       name = "setresgid"
+%)
+
+@define _SYSCALL_SETRESGID16_ARGSTR
+%(
+       argstr = sprintf("%d, %d, %d", rgid, egid, sgid)
+%)
+
+probe syscall.setresgid16 = dw_syscall.setresgid16 !, nd_syscall.setresgid16 {}
+probe syscall.setresgid16.return = dw_syscall.setresgid16.return !, nd_syscall.setresgid16.return {}
+
+# dw_setresgid16 _____________________________________________________
+
+probe dw_syscall.setresgid16 = kernel.function("sys_setresgid16").call ?
+{
+       @_SYSCALL_SETRESGID16_NAME
+       rgid = __short($rgid)
+       egid = __short($egid)
+       sgid = __short($sgid)
+       @_SYSCALL_SETRESGID16_ARGSTR
+}
+probe dw_syscall.setresgid16.return = kernel.function("sys_setresgid16").return ?
+{
+       @_SYSCALL_SETRESGID16_NAME
+       retstr = return_str(1, $return)
+}
+
+# nd_setresgid16 _____________________________________________________
+
+probe nd_syscall.setresgid16 = kprobe.function("sys_setresgid16") ?
+{
+       @_SYSCALL_SETRESGID16_NAME
+       asmlinkage()
+       rgid = __short(uint_arg(1))
+       egid = __short(uint_arg(2))
+       sgid = __short(uint_arg(3))
+       @_SYSCALL_SETRESGID16_ARGSTR
+}
+probe nd_syscall.setresgid16.return = kprobe.function("sys_setresgid16").return ?
+{
+       @_SYSCALL_SETRESGID16_NAME
+       retstr = returnstr(1)
+}

diff --git a/tapset/linux/syscalls2.stp b/tapset/linux/syscalls2.stp
index 2893c50faad97b95e6464a7fbf57ec4a23297e58..ae916be6bf53e5c1c9f9687b682c1e256de6bdcf 100644 (file)
--- a/tapset/linux/syscalls2.stp
+++ b/tapset/linux/syscalls2.stp
@@ -1,22 +1,3 @@
-# setresgid16 ________________________________________________
-#
-# long sys_setresgid16(old_gid_t rgid,
-#                   old_gid_t egid,
-#                   old_gid_t sgid)
-#
-probe syscall.setresgid16 = kernel.function("sys_setresgid16").call ?
-{
-       name = "setresgid"
-       rgid = __short($rgid)
-       egid = __short($egid)
-       sgid = __short($sgid)
-       argstr = sprintf("%d, %d, %d", rgid, egid, sgid)
-}
-probe syscall.setresgid16.return = kernel.function("sys_setresgid16").return ?
-{
-       name = "setresgid16"
-       retstr = return_str(1, $return)
-}
 
 # setresuid __________________________________________________
 #