PR20333/lsetxattr

diff --git a/tapset/linux/nd_syscalls.stp b/tapset/linux/nd_syscalls.stp
index a242c8114f992d4323966cf6b7be41b90de91e5b..c306a79900edc8354d13111b5c971a8e81b4d1c0 100644 (file)
--- a/tapset/linux/nd_syscalls.stp
+++ b/tapset/linux/nd_syscalls.stp
@@ -1,36 +1,4 @@
 
-# lsetxattr __________________________________________________
-# long sys_lsetxattr(char __user *path,
-#               char __user *name,
-#               void __user *value,
-#               size_t size,
-#               int flags)
-#
-probe nd_syscall.lsetxattr = kprobe.function("sys_lsetxattr") ?
-{
-       name = "lsetxattr"
-       asmlinkage()
-       path_uaddr = pointer_arg(1)
-       path = user_string_quoted(path_uaddr)
-       name_uaddr = pointer_arg(2)
-       name_str = user_string_quoted(name_uaddr)
-       value_uaddr = pointer_arg(3)
-       size = ulong_arg(4)
-       value_str = _stp_xattr_val_str(value_uaddr, size)
-       flags = int_arg(5)
-       flags_str = _stp_xattr_flags_str(flags)
-       argstr = sprintf("%s, %s, %s, %u, %s",
-                        user_string_quoted(path_uaddr),
-                        user_string_quoted(name_uaddr),
-                        _stp_xattr_val_str(value_uaddr, size),
-                        size, _stp_xattr_flags_str(flags))
-}
-probe nd_syscall.lsetxattr.return = kprobe.function("sys_lsetxattr").return ?
-{
-       name = "lsetxattr"
-       retstr = returnstr(1)
-}
-
 # lstat ______________________________________________________
 # long sys_lstat(char __user * filename, struct __old_kernel_stat __user * statbuf)
 # long sys_newlstat(char __user * filename, struct stat __user * statbuf)

diff --git a/tapset/linux/sysc_lsetxattr.stp b/tapset/linux/sysc_lsetxattr.stp
new file mode 100644 (file)
index 0000000..a6eb2c9
--- /dev/null
+++ b/tapset/linux/sysc_lsetxattr.stp
@@ -0,0 +1,66 @@
+# lsetxattr __________________________________________________
+# long sys_lsetxattr(char __user *path,
+#               char __user *name,
+#               void __user *value,
+#               size_t size,
+#               int flags)
+#
+
+@define _SYSCALL_LSETXATTR_NAME
+%(
+       name = "lsetxattr"
+%)
+
+@define _SYSCALL_LSETXATTR_ARGSTR
+%(
+       argstr = sprintf("%s, %s, %s, %u, %s", path, name_str, value_str,
+                        size, flags_str)
+%)
+
+probe syscall.lsetxattr = dw_syscall.lsetxattr !, nd_syscall.lsetxattr {}
+probe syscall.lsetxattr.return = dw_syscall.lsetxattr.return !, nd_syscall.lsetxattr.return {}
+
+# dw_lsetxattr _____________________________________________________
+
+probe dw_syscall.lsetxattr = kernel.function("sys_lsetxattr").call
+{
+       @_SYSCALL_LSETXATTR_NAME
+       path_uaddr = @choose_defined($pathname, $path)
+       path = user_string_quoted(@choose_defined($pathname, $path))
+       name_uaddr = $name
+       name_str = user_string_quoted($name)
+       value_uaddr = $value
+       size = __ulong($size)
+       value_str = _stp_xattr_val_str($value, size)
+       flags = __int32($flags)
+       flags_str = _stp_xattr_flags_str(__int32($flags))
+       @_SYSCALL_LSETXATTR_ARGSTR
+}
+probe dw_syscall.lsetxattr.return = kernel.function("sys_lsetxattr").return
+{
+       @_SYSCALL_LSETXATTR_NAME
+       retstr = return_str(1, $return)
+}
+
+# nd_lsetxattr _____________________________________________________
+
+probe nd_syscall.lsetxattr = kprobe.function("sys_lsetxattr") ?
+{
+       @_SYSCALL_LSETXATTR_NAME
+       asmlinkage()
+       path_uaddr = pointer_arg(1)
+       path = user_string_quoted(path_uaddr)
+       name_uaddr = pointer_arg(2)
+       name_str = user_string_quoted(name_uaddr)
+       value_uaddr = pointer_arg(3)
+       size = ulong_arg(4)
+       value_str = _stp_xattr_val_str(value_uaddr, size)
+       flags = int_arg(5)
+       flags_str = _stp_xattr_flags_str(flags)
+       @_SYSCALL_LSETXATTR_ARGSTR
+}
+probe nd_syscall.lsetxattr.return = kprobe.function("sys_lsetxattr").return ?
+{
+       @_SYSCALL_LSETXATTR_NAME
+       retstr = returnstr(1)
+}

diff --git a/tapset/linux/syscalls.stp b/tapset/linux/syscalls.stp
index d3958eb5d32992ef31b866581e2a9e8a90b20fb8..cd07c457c7ec21a5160d7c970c0033932bd5bd46 100644 (file)
--- a/tapset/linux/syscalls.stp
+++ b/tapset/linux/syscalls.stp
@@ -1,35 +1,4 @@
 
-# lsetxattr __________________________________________________
-# long sys_lsetxattr(char __user *path,
-#               char __user *name,
-#               void __user *value,
-#               size_t size,
-#               int flags)
-#
-probe syscall.lsetxattr = kernel.function("sys_lsetxattr").call
-{
-       name = "lsetxattr"
-       path_uaddr = @choose_defined($pathname, $path)
-       path = user_string_quoted(@choose_defined($pathname, $path))
-       name_uaddr = $name
-       name_str = user_string_quoted($name)
-       value_uaddr = $value
-       size = __ulong($size)
-       value_str = _stp_xattr_val_str($value, size)
-       flags = __int32($flags)
-       flags_str = _stp_xattr_flags_str(__int32($flags))
-       argstr = sprintf("%s, %s, %s, %u, %s",
-                       user_string_quoted(@choose_defined($pathname, $path)),
-                       user_string_quoted($name),
-                       _stp_xattr_val_str($value, $size), __ulong($size),
-                       _stp_xattr_flags_str(__int32($flags)))
-}
-probe syscall.lsetxattr.return = kernel.function("sys_lsetxattr").return
-{
-       name = "lsetxattr"
-       retstr = return_str(1, $return)
-}
-
 # lstat ______________________________________________________
 # long sys_lstat(char __user * filename, struct __old_kernel_stat __user * statbuf)
 # long sys_newlstat(char __user * filename, struct stat __user * statbuf)