PR20333/setregid

diff --git a/tapset/linux/nd_syscalls2.stp b/tapset/linux/nd_syscalls2.stp
index 9d2f82c3696721584c7fd4518df51317d858f242..224ed870d1dc3e5410aeeffcec1e3d7a1fe37f52 100644 (file)
--- a/tapset/linux/nd_syscalls2.stp
+++ b/tapset/linux/nd_syscalls2.stp
@@ -1,21 +1,4 @@
 
-# setregid ___________________________________________________
-# long sys_setregid(gid_t rgid, gid_t egid)
-#
-probe nd_syscall.setregid = kprobe.function("sys_setregid") ?
-{
-       name = "setregid"
-       asmlinkage()
-       rgid = __int32(uint_arg(1))
-       egid = __int32(uint_arg(2))
-       argstr = sprintf("%d, %d", rgid, egid)
-}
-probe nd_syscall.setregid.return = kprobe.function("sys_setregid").return ?
-{
-       name = "setregid"
-       retstr = returnstr(1)
-}
-
 # setregid16 _________________________________________________
 # long sys_setregid16(old_gid_t rgid, old_gid_t egid)
 #

diff --git a/tapset/linux/sysc_setregid.stp b/tapset/linux/sysc_setregid.stp
new file mode 100644 (file)
index 0000000..6714aa6
--- /dev/null
+++ b/tapset/linux/sysc_setregid.stp
@@ -0,0 +1,47 @@
+# setregid ___________________________________________________
+# long sys_setregid(gid_t rgid, gid_t egid)
+#
+
+@define _SYSCALL_SETREGID_NAME
+%(
+       name = "setregid"
+%)
+
+@define _SYSCALL_SETREGID_ARGSTR
+%(
+       argstr = sprintf("%d, %d", rgid, egid)
+%)
+
+probe syscall.setregid = dw_syscall.setregid !, nd_syscall.setregid {}
+probe syscall.setregid.return = dw_syscall.setregid.return !, nd_syscall.setregid.return {}
+
+# dw_setregid _____________________________________________________
+
+probe dw_syscall.setregid = kernel.function("sys_setregid").call
+{
+       @_SYSCALL_SETREGID_NAME
+       rgid = __int32($rgid)
+       egid = __int32($egid)
+       @_SYSCALL_SETREGID_ARGSTR
+}
+probe dw_syscall.setregid.return = kernel.function("sys_setregid").return
+{
+       @_SYSCALL_SETREGID_NAME
+       retstr = return_str(1, $return)
+}
+
+# nd_setregid _____________________________________________________
+
+probe nd_syscall.setregid = kprobe.function("sys_setregid") ?
+{
+       @_SYSCALL_SETREGID_NAME
+       asmlinkage()
+       rgid = __int32(uint_arg(1))
+       egid = __int32(uint_arg(2))
+       @_SYSCALL_SETREGID_ARGSTR
+}
+probe nd_syscall.setregid.return = kprobe.function("sys_setregid").return ?
+{
+       @_SYSCALL_SETREGID_NAME
+       retstr = returnstr(1)
+}

diff --git a/tapset/linux/syscalls2.stp b/tapset/linux/syscalls2.stp
index af86a194879e6f99cfdface91df965eba1231a5c..cf42ae37137ce0ce5f55e4d66c488fabac4a95c1 100644 (file)
--- a/tapset/linux/syscalls2.stp
+++ b/tapset/linux/syscalls2.stp
@@ -1,19 +1,3 @@
-
-# setregid ___________________________________________________
-# long sys_setregid(gid_t rgid, gid_t egid)
-#
-probe syscall.setregid = kernel.function("sys_setregid").call
-{
-       name = "setregid"
-       rgid = __int32($rgid)
-       egid = __int32($egid)
-       argstr = sprintf("%d, %d", rgid, egid)
-}
-probe syscall.setregid.return = kernel.function("sys_setregid").return
-{
-       name = "setregid"
-       retstr = return_str(1, $return)
-}
 # setregid16 _________________________________________________
 # long sys_setregid16(old_gid_t rgid, old_gid_t egid)
 #