PR20333/gethostname

diff --git a/tapset/linux/nd_syscalls.stp b/tapset/linux/nd_syscalls.stp
index f94c098be693c6d192b929092d09b3e58e2524e6..997abcb4e085221b657ee47ff22ffdfd41df1687 100644 (file)
--- a/tapset/linux/nd_syscalls.stp
+++ b/tapset/linux/nd_syscalls.stp
@@ -1,20 +1,4 @@
 
-# gethostname ________________________________________________
-# long sys_gethostname(char __user *name, int len)
-probe nd_syscall.gethostname = kprobe.function("sys_gethostname") ?
-{
-       name = "gethostname"
-       asmlinkage()
-       name_uaddr = pointer_arg(1)
-       len = int_arg(2)
-       argstr = sprintf ("%p, %d", name_uaddr, len)
-}
-probe nd_syscall.gethostname.return = kprobe.function("sys_gethostname").return ?
-{
-       name = "gethostname"
-       retstr = returnstr(1)
-}
-
 # getitimer __________________________________________________
 # sys_getitimer(int which, struct itimerval __user *value)
 #

diff --git a/tapset/linux/sysc_gethostname.stp b/tapset/linux/sysc_gethostname.stp
new file mode 100644 (file)
index 0000000..729ec43
--- /dev/null
+++ b/tapset/linux/sysc_gethostname.stp
@@ -0,0 +1,46 @@
+# gethostname ________________________________________________
+# long sys_gethostname(char __user *name, int len)
+
+@define _SYSCALL_GETHOSTNAME_NAME
+%(
+       name = "gethostname"
+%)
+
+@define _SYSCALL_GETHOSTNAME_ARGSTR
+%(
+       argstr = sprintf ("%p, %d", name_uaddr, len)
+%)
+
+probe syscall.gethostname = dw_syscall.gethostname !, nd_syscall.gethostname {}
+probe syscall.gethostname.return = dw_syscall.gethostname.return !, nd_syscall.gethostname.return {}
+
+# dw_gethostname _____________________________________________________
+
+probe dw_syscall.gethostname = kernel.function("sys_gethostname").call ?
+{
+       @_SYSCALL_GETHOSTNAME_NAME
+       name_uaddr = $name
+       len = __int32($len)
+       @_SYSCALL_GETHOSTNAME_ARGSTR
+}
+probe dw_syscall.gethostname.return = kernel.function("sys_gethostname").return ?
+{
+       @_SYSCALL_GETHOSTNAME_NAME
+       retstr = return_str(1, $return)
+}
+
+# nd_gethostname _____________________________________________________
+
+probe nd_syscall.gethostname = kprobe.function("sys_gethostname") ?
+{
+       @_SYSCALL_GETHOSTNAME_NAME
+       asmlinkage()
+       name_uaddr = pointer_arg(1)
+       len = int_arg(2)
+       @_SYSCALL_GETHOSTNAME_ARGSTR
+}
+probe nd_syscall.gethostname.return = kprobe.function("sys_gethostname").return ?
+{
+       @_SYSCALL_GETHOSTNAME_NAME
+       retstr = returnstr(1)
+}

diff --git a/tapset/linux/syscalls.stp b/tapset/linux/syscalls.stp
index f43ba9c5a0262a3ab22b733341dd8907b81824ad..c4da7c31c35e4d67b124adc79d16d98db430ba05 100644 (file)
--- a/tapset/linux/syscalls.stp
+++ b/tapset/linux/syscalls.stp
@@ -1,19 +1,4 @@
 
-# gethostname ________________________________________________
-# long sys_gethostname(char __user *name, int len)
-probe syscall.gethostname = kernel.function("sys_gethostname").call ?
-{
-       name = "gethostname"
-       name_uaddr = $name
-       len = __int32($len)
-       argstr = sprintf ("%p, %d", name_uaddr, len)
-}
-probe syscall.gethostname.return = kernel.function("sys_gethostname").return ?
-{
-       name = "gethostname"
-       retstr = return_str(1, $return)
-}
-
 # getitimer __________________________________________________
 # sys_getitimer(int which, struct itimerval __user *value)
 #