*** empty log message ***

4 files changed, 68 insertions, 119 deletions

diff --git a/tapset/i686/syscalls.stp b/tapset/i686/syscalls.stp
index 1a698eff..8ce1828f 100644
--- a/tapset/i686/syscalls.stp
+++ b/tapset/i686/syscalls.stp
@@ -1,32 +1,3 @@
-# getegid16 __________________________________________________
-# long sys_getegid16(void)
-probe syscall.getegid16 = kernel.function("sys_getegid16") {
-	name = "getegid16"
-}
-probe syscall.getegid16.return = kernel.function("sys_getegid16").return {
-	name = "getegid16"
-	retstr = returnstr(1)
-}
-
-# geteuid16 __________________________________________________
-# long sys_geteuid16(void)
-probe syscall.geteuid16 = kernel.function("sys_geteuid16") {
-	name = "geteuid16"
-}
-probe syscall.geteuid16.return = kernel.function("sys_geteuid16").return {
-	name = "geteuid16"
-	retstr = returnstr(1)
-}
-
-# getgid16 ___________________________________________________
-# long sys_getgid16(void)
-probe syscall.getgid16 = kernel.function("sys_getgid16") {
-	name = "getgid16"
-}
-probe syscall.getgid16.return = kernel.function("sys_getgid16").return {
-	name = "getgid16"
-	retstr = returnstr(1)
-}
 
 # getgroups16 ________________________________________________
 # long sys_getgroups16(int gidsetsize, old_gid_t __user *grouplist)
@@ -41,16 +12,6 @@ probe syscall.getgroups16.return = kernel.function("sys_getgroups16").return {
 	retstr = returnstr(1)
 }
 
-# getuid16 ___________________________________________________
-# long sys_getuid16(void)
-probe syscall.getuid16 = kernel.function("sys_getuid16") {
-	name = "getuid16"
-}
-probe syscall.getuid16.return = kernel.function("sys_getuid16").return {
-	name = "getuid16"
-	retstr = returnstr(1)
-}
-
 # lstat ______________________________________________________
 # long sys_lstat(char __user * filename, struct __old_kernel_stat __user * statbuf)
 probe syscall.lstat = kernel.function("sys_lstat") {
diff --git a/tapset/syscalls.stp b/tapset/syscalls.stp
index ab8fb7c6..b0e75818 100644
--- a/tapset/syscalls.stp
+++ b/tapset/syscalls.stp
@@ -850,6 +850,16 @@ probe syscall.getegid.return = kernel.function("sys_getegid").return {
 	retstr = returnstr(1)
 }
 
+# getegid16 __________________________________________________
+# long sys_getegid16(void)
+probe syscall.getegid16 = kernel.function("sys_getegid16") ? {
+	name = "getegid16"
+}
+probe syscall.getegid16.return = kernel.function("sys_getegid16").return ? {
+	name = "getegid16"
+	retstr = returnstr(1)
+}
+
 # geteuid ____________________________________________________
 # long sys_geteuid(void)
 probe syscall.geteuid = kernel.function("sys_geteuid") {
@@ -860,6 +870,16 @@ probe syscall.geteuid.return = kernel.function("sys_geteuid").return {
 	retstr = returnstr(1)
 }
 
+# geteuid16 __________________________________________________
+# long sys_geteuid16(void)
+probe syscall.geteuid16 = kernel.function("sys_geteuid16") ? {
+	name = "geteuid16"
+}
+probe syscall.geteuid16.return = kernel.function("sys_geteuid16").return ? {
+	name = "geteuid16"
+	retstr = returnstr(1)
+}
+
 # getgid _____________________________________________________
 # long sys_getgid(void)
 probe syscall.getgid =kernel.function("sys_getgid") {
@@ -870,6 +890,16 @@ probe syscall.getgid.return = kernel.function("sys_getgid").return {
 	retstr = returnstr(1)
 }
 
+# getgid16 ___________________________________________________
+# long sys_getgid16(void)
+probe syscall.getgid16 = kernel.function("sys_getgid16") {
+	name = "getgid16"
+}
+probe syscall.getgid16.return = kernel.function("sys_getgid16").return ? {
+	name = "getgid16"
+	retstr = returnstr(1)
+}
+
 # getgroups __________________________________________________
 # long sys_getgroups(int gidsetsize, gid_t __user *grouplist)
 probe syscall.getgroups = kernel.function("sys_getgroups") {
@@ -1000,14 +1030,14 @@ probe syscall.getresgid.return = kernel.function("sys_getresgid").return {
 # long sys_getresgid16(old_uid_t __user *rgid,
 #                 old_uid_t __user *egid,
 #                 old_uid_t __user *sgid)
-probe syscall.getresgid16 = kernel.function("sys_getresgid") {
+probe syscall.getresgid16 = kernel.function("sys_getresgid16") {
 	name = "getresgid16"
 	rgid_uaddr = $rgid
 	egid_uaddr = $egid
 	sgid_uaddr = $sgid
 	argstr = sprintf("[%p], [%p], [%p]", rgid_uaddr, egid_uaddr, sgid_uaddr)
 }
-probe syscall.getresgid16.return = kernel.function("sys_getresgid").return {
+probe syscall.getresgid16.return = kernel.function("sys_getresgid16").return {
 	name = "getresgid16"
 	retstr = returnstr(1)
 }
@@ -1032,14 +1062,14 @@ probe syscall.getresuid.return = kernel.function("sys_getresuid").return {
 # long sys_getresuid16(old_uid_t __user *ruid,
 #		old_uid_t __user *euid,
 #		old_uid_t __user *suid)
-probe syscall.getresuid16 = kernel.function("sys_getresuid") {
+probe syscall.getresuid16 = kernel.function("sys_getresuid16") {
 	name = "getresuid16"
 	ruid_uaddr = $ruid
 	euid_uaddr = $euid
 	suid_uaddr = $suid
 	argstr = sprintf("[%p], [%p], [%p]", ruid_uaddr, euid_uaddr, suid_uaddr)
 }
-probe syscall.getresuid16.return = kernel.function("sys_getresuid").return {
+probe syscall.getresuid16.return = kernel.function("sys_getresuid16").return {
 	name = "getresuid16"
 	retstr = returnstr(1)
 }
@@ -1157,6 +1187,16 @@ probe syscall.getuid.return = kernel.function("sys_getuid").return {
 	retstr = returnstr(1)
 }
 
+# getuid16 ___________________________________________________
+# long sys_getuid16(void)
+probe syscall.getuid16 = kernel.function("sys_getuid16") ? {
+	name = "getuid16"
+}
+probe syscall.getuid16.return = kernel.function("sys_getuid16").return ? {
+	name = "getuid16"
+	retstr = returnstr(1)
+}
+
 # getxattr ___________________________________________________
 # ssize_t sys_getxattr(char __user *path, char __user *name,
 #		void __user *value, size_t size)
diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp
index 6fb51303..b4037c83 100644
--- a/tapset/syscalls2.stp
+++ b/tapset/syscalls2.stp
@@ -1169,8 +1169,7 @@ probe syscall.setfsuid16.return = kernel.function("sys_setfsuid").return {
 }
 # setgid _____________________________________________________
 #
-# asmlinkage long
-# sys_setgid(gid_t gid)
+# long sys_setgid(gid_t gid)
 #
 probe syscall.setgid = kernel.function("sys_setgid") {
 	name = "setgid"
@@ -1183,23 +1182,20 @@ probe syscall.setgid.return = kernel.function("sys_setgid").return {
 }
 # setgid16 ___________________________________________________
 #
-# asmlinkage long
-# sys_setgid16(old_gid_t gid)
+# long sys_setgid16(old_gid_t gid)
 #
 probe syscall.setgid16 = kernel.function("sys_setgid16") ? {
-	name = "setgid"
+	name = "setgid16"
 	gid = $gid
 	argstr = sprint($gid)
 }
 probe syscall.setgid16.return = kernel.function("sys_setgid16").return ? {
-	name = "setgid"
+	name = "setgid16"
 	retstr = returnstr(1)
 }
 # setgroups __________________________________________________
 #
-# asmlinkage long
-# sys_setgroups(int gidsetsize,
-#		   gid_t __user *grouplist)
+# long sys_setgroups(int gidsetsize, gid_t __user *grouplist)
 #
 probe syscall.setgroups = kernel.function("sys_setgroups") {
 	name = "setgroups"
@@ -1343,26 +1339,24 @@ probe syscall.setresgid.return = kernel.function("sys_setresgid").return {
 }
 # setresgid16 ________________________________________________
 #
-# asmlinkage long
-# sys_setresgid16(old_gid_t rgid,
+# long sys_setresgid16(old_gid_t rgid,
 #		     old_gid_t egid,
 #		     old_gid_t sgid)
 #
 probe syscall.setresgid16 = kernel.function("sys_setresgid16") ? {
-	name = "setresgid"
-	rgid = $rgid
-	egid = $egid
-	sgid = $sgid
-	argstr = sprintf("%d, %d, %d", $rgid, $egid, $sgid)
+	name = "setresgid16"
+	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 = "setresgid"
+	name = "setresgid16"
 	retstr = returnstr(1)
 }
 # setresuid __________________________________________________
 #
-# asmlinkage long
-# sys_setresuid(uid_t ruid,
+# long sys_setresuid(uid_t ruid,
 #		   uid_t euid,
 #		   uid_t suid)
 #
@@ -1379,27 +1373,23 @@ probe syscall.setresuid.return = kernel.function("sys_setresuid").return {
 }
 # setresuid16 ________________________________________________
 #
-# asmlinkage long
-# sys_setresuid16(old_uid_t ruid,
+# long sys_setresuid16(old_uid_t ruid,
 #		     old_uid_t euid,
 #		     old_uid_t suid)
 #
 probe syscall.setresuid16 = kernel.function("sys_setresuid16") ? {
-	name = "setresuid"
-	ruid = $ruid
-	euid = $euid
-	suid = $suid
-	argstr = sprintf("%d, %d, %d", $ruid, $euid, $suid)
+	name = "setresuid16"
+	ruid = __short($ruid)
+	euid = __short($euid)
+	suid = __short($suid)
+	argstr = sprintf("%d, %d, %d", ruid, euid, suid)
 }
 probe syscall.setresuid16.return = kernel.function("sys_setresuid16").return ? {
-	name = "setresuid"
+	name = "setresuid16"
 	retstr = returnstr(1)
 }
 # setreuid ___________________________________________________
-#
-# asmlinkage long
-# sys_setreuid(uid_t ruid,
-#		  uid_t euid)
+# long sys_setreuid(uid_t ruid, uid_t euid)
 #
 probe syscall.setreuid = kernel.function("sys_setreuid") {
 	name = "setreuid"
@@ -1412,10 +1402,7 @@ probe syscall.setreuid.return = kernel.function("sys_setreuid").return {
 	retstr = returnstr(1)
 }
 # setreuid16 _________________________________________________
-#
-# asmlinkage long
-# sys_setreuid16(old_uid_t ruid,
-#		    old_uid_t euid)
+# long sys_setreuid16(old_uid_t ruid, old_uid_t euid)
 #
 probe syscall.setreuid16 = kernel.function("sys_setreuid") {
 	name = "setreuid16"
@@ -1542,12 +1529,12 @@ probe syscall.setuid.return = kernel.function("sys_setuid").return {
 # sys_setuid16(old_uid_t uid)
 #
 probe syscall.setuid16 = kernel.function("sys_setuid16") ? {
-	name = "setuid"
+	name = "setuid16"
 	uid = $uid
 	argstr = sprint($uid)
 }
 probe syscall.setuid16.return = kernel.function("sys_setuid16").return ? {
-	name = "setuid"
+	name = "setuid16"
 	retstr = returnstr(1)
 }
 # setxattr ___________________________________________________
diff --git a/tapset/x86_64/syscalls.stp b/tapset/x86_64/syscalls.stp
index 7b31ab1e..27f4f2ce 100644
--- a/tapset/x86_64/syscalls.stp
+++ b/tapset/x86_64/syscalls.stp
@@ -1,33 +1,3 @@
-# getegid16 __________________________________________________
-# long sys_getegid16(void)
-probe syscall.getegid16 = kernel.function("sys_getegid16") {
-	name = "getegid16"
-}
-probe syscall.getegid16.return = kernel.function("sys_getegid16").return {
-	name = "getegid16"
-	retstr = returnstr(1)
-}
-
-# geteuid16 __________________________________________________
-# long sys_geteuid16(void)
-probe syscall.geteuid16 = kernel.function("sys_geteuid16") {
-	name = "geteuid16"
-}
-probe syscall.geteuid16.return = kernel.function("sys_geteuid16").return {
-	name = "geteuid16"
-	retstr = returnstr(1)
-}
-
-# getgid16 ___________________________________________________
-# long sys_getgid16(void)
-probe syscall.getgid16 = kernel.function("sys_getgid16") {
-	name = "getgid16"
-}
-probe syscall.getgid16.return = kernel.function("sys_getgid16").return {
-	name = "getgid16"
-	retstr = returnstr(1)
-}
-
 # getgroups16 ________________________________________________
 # long sys_getgroups16(int gidsetsize, old_gid_t __user *grouplist)
 probe syscall.getgroups16 = kernel.function("sys_getgroups16") {
@@ -41,15 +11,6 @@ probe syscall.getgroups16.return = kernel.function("sys_getgroups16").return {
 	retstr = returnstr(1)
 }
 
-# getuid16 ___________________________________________________
-# long sys_getuid16(void)
-probe syscall.getuid16 = kernel.function("sys_getuid16") {
-	name = "getuid16"
-}
-probe syscall.getuid16.return = kernel.function("sys_getuid16").return {
-	name = "getuid16"
-	retstr = returnstr(1)
-}
 
 # lstat ______________________________________________________
 # long sys_lstat(char __user * filename, struct __old_kernel_stat __user * statbuf)