From 02ec9c0bb3f0396b97125870d234945a5ca9dcca Mon Sep 17 00:00:00 2001
From: Martin Cermak <mcermak@redhat.com>
Date: Tue, 3 Jan 2017 13:43:00 +0100
Subject: [PATCH] PR20333/umask

---
 tapset/linux/nd_syscalls2.stp | 16 -------------
 tapset/linux/sysc_umask.stp   | 45 +++++++++++++++++++++++++++++++++++
 tapset/linux/syscalls2.stp    | 15 ------------
 3 files changed, 45 insertions(+), 31 deletions(-)
 create mode 100644 tapset/linux/sysc_umask.stp

diff --git a/tapset/linux/nd_syscalls2.stp b/tapset/linux/nd_syscalls2.stp
index 8441c5ff0..89beaa9c1 100644
--- a/tapset/linux/nd_syscalls2.stp
+++ b/tapset/linux/nd_syscalls2.stp
@@ -1,20 +1,4 @@
 
-# umask ______________________________________________________
-# long sys_umask(int mask)
-#
-probe nd_syscall.umask = kprobe.function("sys_umask") ?
-{
-	name = "umask"
-	asmlinkage()
-	mask = uint_arg(1)
-	argstr = sprintf("%#o", mask)
-}
-probe nd_syscall.umask.return = kprobe.function("sys_umask").return ?
-{
-	name = "umask"
-	retstr = returnstr(3)
-}
-
 # umount _____________________________________________________
 # long sys_umount(char __user * name, int flags)
 # SYSCALL_DEFINE1(oldumount, char __user *, name)
diff --git a/tapset/linux/sysc_umask.stp b/tapset/linux/sysc_umask.stp
new file mode 100644
index 000000000..a746ab688
--- /dev/null
+++ b/tapset/linux/sysc_umask.stp
@@ -0,0 +1,45 @@
+# umask ______________________________________________________
+# long sys_umask(int mask)
+#
+
+@define _SYSCALL_UMASK_NAME
+%(
+	name = "umask"
+%)
+
+@define _SYSCALL_UMASK_ARGSTR
+%(
+	argstr = sprintf("%#o", mask)
+%)
+
+probe syscall.umask = dw_syscall.umask !, nd_syscall.umask {}
+probe syscall.umask.return = dw_syscall.umask.return !, nd_syscall.umask.return {}
+
+# dw_umask _____________________________________________________
+
+probe dw_syscall.umask = kernel.function("sys_umask").call
+{
+	@_SYSCALL_UMASK_NAME
+	mask = __uint32($mask)
+	@_SYSCALL_UMASK_ARGSTR
+}
+probe dw_syscall.umask.return = kernel.function("sys_umask").return
+{
+	@_SYSCALL_UMASK_NAME
+	retstr = return_str(3, $return)
+}
+
+# nd_umask _____________________________________________________
+
+probe nd_syscall.umask = kprobe.function("sys_umask") ?
+{
+	@_SYSCALL_UMASK_NAME
+	asmlinkage()
+	mask = uint_arg(1)
+	@_SYSCALL_UMASK_ARGSTR
+}
+probe nd_syscall.umask.return = kprobe.function("sys_umask").return ?
+{
+	@_SYSCALL_UMASK_NAME
+	retstr = returnstr(3)
+}
diff --git a/tapset/linux/syscalls2.stp b/tapset/linux/syscalls2.stp
index ed378549e..5d01a0942 100644
--- a/tapset/linux/syscalls2.stp
+++ b/tapset/linux/syscalls2.stp
@@ -1,19 +1,4 @@
 
-# umask ______________________________________________________
-# long sys_umask(int mask)
-#
-probe syscall.umask = kernel.function("sys_umask").call
-{
-	name = "umask"
-	mask = __uint32($mask)
-	argstr = sprintf("%#o", __uint32($mask))
-}
-probe syscall.umask.return = kernel.function("sys_umask").return
-{
-	name = "umask"
-	retstr = return_str(3, $return)
-}
-
 # umount _____________________________________________________
 # long sys_umount(char __user * name, int flags)
 # SYSCALL_DEFINE1(oldumount, char __user *, name)
-- 
2.43.5