Fix decoding of 16-bit *chown and [gs]et*[gu]id syscalls

Define two sets of parsers on architectures that support (either
directly or via multiarch) 16-bit and 32-bit uid/gid syscalls
simultaneously.  Since the code in these two sets is essentially
the same and the key difference between them is the size of uid_t,
implement it by parametrizing uid_t and names of parser functions.

* defs.h (NEED_UID16_PARSERS): New macro.
* linux/syscall.h [NEED_UID16_PARSERS] (sys_chown16, sys_fchown16,
sys_getresuid16, sys_getuid16, sys_setfsuid16, sys_setresuid16,
sys_setreuid16, sys_setuid16): New prototypes.
* linux/dummy.h (sys_geteuid16): Alias to sys_getuid16.
(sys_getegid16, sys_getgid16, sys_getresgid16, sys_setfsgid16,
sys_setgid16, sys_setregid16, sys_setresgid16): Alias to corresponding
sys_*uid16 functions.
* uid.c: Stop including <asm/posix_types.h>.
Parametrize uid_t and names of all exported functions.
(get_print_uid): New function.
(sys_getresuid): Use it.
(printuid): Check for (uid_t) -1.
* uid16.c: New file.
* Makefile.am (strace_SOURCES): Add it.
* linux/arm/syscallent.h: Use sys_chown16, sys_fchown16, sys_getegid16,
sys_geteuid16, sys_getgid16, sys_getresgid16, sys_getresuid16,
sys_getuid16, sys_setfsgid16, sys_setfsuid16, sys_setgid16,
sys_setregid16, sys_setresgid16, sys_setresuid16, sys_setreuid16,
and sys_setuid16 parsers for *chown and [gs]et*[gu]id syscall entries.
* linux/bfin/syscallent.h: Likewise.
* linux/i386/syscallent.h: Likewise.
* linux/m68k/syscallent.h: Likewise.
* linux/microblaze/syscallent.h: Likewise.
* linux/s390/syscallent.h: Likewise.
* linux/sparc/syscallent.h: Likewise.
* linux/sh/syscallent.h: Likewise.
* linux/sh64/syscallent.h: Likewise.
* tests/uid16.c: New file.
* tests/uid16.test: New test.
* tests/Makefile.am (CHECK_PROGRAMS): Add uid16.
(TESTS): Add uid16.test.
* tests/.gitignore: Add uid16.

Author: ldv-alt

Makefile.am

@@ -94,6 +94,7 @@ strace_SOURCES =	\
 	time.c		\
 	truncate.c	\
 	uid.c		\
+	uid16.c		\
 	umask.c		\
 	umount.c	\
 	uname.c		\

defs.h

@@ -549,6 +549,20 @@ extern const struct xlat whence_codes[];
 #define STACKTRACE_INVALIDATE_CACHE 0400  /* Trigger proc/maps cache updating */
 #define STACKTRACE_CAPTURE_ON_ENTER 01000 /* Capture stacktrace on "entering" stage */
 
+#if defined(ARM) || defined(AARCH64) \
+ || defined(I386) || defined(X32) || defined(X86_64) \
+ || defined(BFIN) \
+ || defined(M68K) \
+ || defined(MICROBLAZE) \
+ || defined(S390) \
+ || defined(SH) || defined(SH64) \
+ || defined(SPARC) || defined(SPARC64) \
+ /**/
+# define NEED_UID16_PARSERS 1
+#else
+# define NEED_UID16_PARSERS 0
+#endif
+
 typedef enum {
 	CFLAG_NONE = 0,
 	CFLAG_ONLY_STATS,

linux/arm/syscallent.h

@@ -42,15 +42,15 @@
 	{ 1,	0,	sys_time,		"time"		}, /* 13 */
 	{ 3,	TF,	sys_mknod,		"mknod"		}, /* 14 */
 	{ 2,	TF,	sys_chmod,		"chmod"		}, /* 15 */
-	{ 3,	TF,	sys_chown,		"lchown"	}, /* 16 */
+	{ 3,	TF,	sys_chown16,		"lchown"	}, /* 16 */
 	{ 0,	TM,	sys_break,		"break"		}, /* 17 */
 	{ 2,	TF,	sys_oldstat,		"oldstat"	}, /* 18 */
 	{ 3,	TD,	sys_lseek,		"lseek"		}, /* 19 */
 	{ 0,	0,	sys_getpid,		"getpid"	}, /* 20 */
 	{ 5,	TF,	sys_mount,		"mount"		}, /* 21 */
 	{ 1,	TF,	sys_umount,		"oldumount"	}, /* 22 */
-	{ 1,	0,	sys_setuid,		"setuid"	}, /* 23 */
-	{ 0,	NF,	sys_getuid,		"getuid"	}, /* 24 */
+	{ 1,	0,	sys_setuid16,		"setuid"	}, /* 23 */
+	{ 0,	NF,	sys_getuid16,		"getuid"	}, /* 24 */
 	{ 1,	0,	sys_stime,		"stime"		}, /* 25 */
 	{ 4,	0,	sys_ptrace,		"ptrace"	}, /* 26 */
 	{ 1,	0,	sys_alarm,		"alarm"		}, /* 27 */
@@ -72,11 +72,11 @@
 	{ 1,	0,	sys_times,		"times"		}, /* 43 */
 	{ 0,	0,	sys_prof,		"prof"		}, /* 44 */
 	{ 1,	TM|SI,	sys_brk,		"brk"		}, /* 45 */
-	{ 1,	0,	sys_setgid,		"setgid"	}, /* 46 */
-	{ 0,	NF,	sys_getgid,		"getgid"	}, /* 47 */
+	{ 1,	0,	sys_setgid16,		"setgid"	}, /* 46 */
+	{ 0,	NF,	sys_getgid16,		"getgid"	}, /* 47 */
 	{ 3,	TS,	sys_signal,		"signal"	}, /* 48 */
-	{ 0,	NF,	sys_geteuid,		"geteuid"	}, /* 49 */
-	{ 0,	NF,	sys_getegid,		"getegid"	}, /* 50 */
+	{ 0,	NF,	sys_geteuid16,		"geteuid"	}, /* 49 */
+	{ 0,	NF,	sys_getegid16,		"getegid"	}, /* 50 */
 	{ 1,	TF,	sys_acct,		"acct"		}, /* 51 */
 	{ 2,	TF,	sys_umount2,		"umount"	}, /* 52 */
 	{ 0,	0,	sys_lock,		"lock"		}, /* 53 */
@@ -96,8 +96,8 @@
 	{ 3,	TS,	sys_sigaction,		"sigaction"	}, /* 67 */
 	{ 0,	TS,	sys_siggetmask,		"sgetmask"	}, /* 68 */
 	{ 1,	TS,	sys_sigsetmask,		"ssetmask"	}, /* 69 */
-	{ 2,	0,	sys_setreuid,		"setreuid"	}, /* 70 */
-	{ 2,	0,	sys_setregid,		"setregid"	}, /* 71 */
+	{ 2,	0,	sys_setreuid16,		"setreuid"	}, /* 70 */
+	{ 2,	0,	sys_setregid16,		"setregid"	}, /* 71 */
 	{ 3,	TS,	sys_sigsuspend,		"sigsuspend"	}, /* 72 */
 	{ 1,	TS,	sys_sigpending,		"sigpending"	}, /* 73 */
 	{ 2,	0,	sys_sethostname,	"sethostname"	}, /* 74 */
@@ -121,7 +121,7 @@
 	{ 2,	TF,	sys_truncate,		"truncate"	}, /* 92 */
 	{ 2,	TD,	sys_ftruncate,		"ftruncate"	}, /* 93 */
 	{ 2,	TD,	sys_fchmod,		"fchmod"	}, /* 94 */
-	{ 3,	TD,	sys_fchown,		"fchown"	}, /* 95 */
+	{ 3,	TD,	sys_fchown16,		"fchown"	}, /* 95 */
 	{ 2,	0,	sys_getpriority,	"getpriority"	}, /* 96 */
 	{ 3,	0,	sys_setpriority,	"setpriority"	}, /* 97 */
 	{ 4,	0,	sys_profil,		"profil"	}, /* 98 */
@@ -164,8 +164,8 @@
 	{ 3,	0,	sys_sysfs,		"sysfs"		}, /* 135 */
 	{ 1,	0,	sys_personality,	"personality"	}, /* 136 */
 	{ 5,	0,	sys_afs_syscall,	"afs_syscall"	}, /* 137 */
-	{ 1,	NF,	sys_setfsuid,		"setfsuid"	}, /* 138 */
-	{ 1,	NF,	sys_setfsgid,		"setfsgid"	}, /* 139 */
+	{ 1,	NF,	sys_setfsuid16,		"setfsuid"	}, /* 138 */
+	{ 1,	NF,	sys_setfsgid16,		"setfsgid"	}, /* 139 */
 	{ 5,	TD,	sys_llseek,		"_llseek"	}, /* 140 */
 	{ 3,	TD,	sys_getdents,		"getdents"	}, /* 141 */
 	{ 5,	TD,	sys_select,		"select"	}, /* 142 */
@@ -190,14 +190,14 @@
 	{ 2,	0,	sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 161 */
 	{ 2,	0,	sys_nanosleep,		"nanosleep"	}, /* 162 */
 	{ 5,	TM|SI,	sys_mremap,		"mremap"	}, /* 163 */
-	{ 3,	0,	sys_setresuid,		"setresuid"	}, /* 164 */
-	{ 3,	0,	sys_getresuid,		"getresuid"	}, /* 165 */
+	{ 3,	0,	sys_setresuid16,	"setresuid"	}, /* 164 */
+	{ 3,	0,	sys_getresuid16,	"getresuid"	}, /* 165 */
 	{ 5,	0,	sys_vm86,		"vm86"		}, /* 166 */
 	{ 5,	0,	sys_query_module,	"query_module"	}, /* 167 */
 	{ 3,	TD,	sys_poll,		"poll"		}, /* 168 */
 	{ 3,	0,	sys_nfsservctl,		"nfsservctl"	}, /* 169 */
-	{ 3,	0,	sys_setresgid,		"setresgid"	}, /* 170 */
-	{ 3,	0,	sys_getresgid,		"getresgid"	}, /* 171 */
+	{ 3,	0,	sys_setresgid16,	"setresgid"	}, /* 170 */
+	{ 3,	0,	sys_getresgid16,	"getresgid"	}, /* 171 */
 	{ 5,	0,	sys_prctl,		"prctl"		}, /* 172 */
 	{ 0,	TS,	sys_rt_sigreturn,	"rt_sigreturn"	}, /* 173 */
 	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"	}, /* 174 */
@@ -209,7 +209,7 @@
 
 	{ 6,	TD,	sys_pread,		"pread"		}, /* 180 */
 	{ 6,	TD,	sys_pwrite,		"pwrite"	}, /* 181 */
-	{ 3,	TF,	sys_chown,		"chown"		}, /* 182 */
+	{ 3,	TF,	sys_chown16,		"chown"		}, /* 182 */
 	{ 2,	TF,	sys_getcwd,		"getcwd"	}, /* 183 */
 	{ 2,	0,	sys_capget,		"capget"	}, /* 184 */
 	{ 2,	0,	sys_capset,		"capset"	}, /* 185 */

linux/bfin/syscallent.h

@@ -42,15 +42,15 @@
 	{ 1,	0,	sys_time,		"time"		}, /* 13 */
 	{ 3,	TF,	sys_mknod,		"mknod"		}, /* 14 */
 	{ 2,	TF,	sys_chmod,		"chmod"		}, /* 15 */
-	{ 3,	TF,	sys_chown,		"chown"		}, /* 16 */
+	{ 3,	TF,	sys_chown16,		"chown"		}, /* 16 */
 	{ 0,	TM,	sys_break,		"break"		}, /* 17 */
 	{ 2,	TF,	sys_oldstat,		"oldstat"	}, /* 18 */
 	{ 3,	TD,	sys_lseek,		"lseek"		}, /* 19 */
 	{ 0,	0,	sys_getpid,		"getpid"	}, /* 20 */
 	{ 5,	TF,	sys_mount,		"mount"		}, /* 21 */
 	{ 1,	TF,	sys_umount,		"oldumount"	}, /* 22 */
-	{ 1,	0,	sys_setuid,		"setuid"	}, /* 23 */
-	{ 0,	NF,	sys_getuid,		"getuid"	}, /* 24 */
+	{ 1,	0,	sys_setuid16,		"setuid"	}, /* 23 */
+	{ 0,	NF,	sys_getuid16,		"getuid"	}, /* 24 */
 	{ 1,	0,	sys_stime,		"stime"		}, /* 25 */
 	{ 4,	0,	sys_ptrace,		"ptrace"	}, /* 26 */
 	{ 1,	0,	sys_alarm,		"alarm"		}, /* 27 */
@@ -72,11 +72,11 @@
 	{ 1,	0,	sys_times,		"times"		}, /* 43 */
 	{ 0,	0,	sys_prof,		"prof"		}, /* 44 */
 	{ 1,	TM|SI,	sys_brk,		"brk"		}, /* 45 */
-	{ 1,	0,	sys_setgid,		"setgid"	}, /* 46 */
-	{ 0,	NF,	sys_getgid,		"getgid"	}, /* 47 */
+	{ 1,	0,	sys_setgid16,		"setgid"	}, /* 46 */
+	{ 0,	NF,	sys_getgid16,		"getgid"	}, /* 47 */
 	{ 3,	TS,	sys_signal,		"signal"	}, /* 48 */
-	{ 0,	NF,	sys_geteuid,		"geteuid"	}, /* 49 */
-	{ 0,	NF,	sys_getegid,		"getegid"	}, /* 50 */
+	{ 0,	NF,	sys_geteuid16,		"geteuid"	}, /* 49 */
+	{ 0,	NF,	sys_getegid16,		"getegid"	}, /* 50 */
 	{ 1,	TF,	sys_acct,		"acct"		}, /* 51 */
 	{ 2,	TF,	sys_umount2,		"umount"	}, /* 52 */
 	{ 0,	0,	sys_lock,		"lock"		}, /* 53 */
@@ -96,8 +96,8 @@
 	{ 3,	TS,	sys_sigaction,		"sigaction"	}, /* 67 */
 	{ 0,	TS,	sys_siggetmask,		"sgetmask"	}, /* 68 */
 	{ 1,	TS,	sys_sigsetmask,		"ssetmask"	}, /* 69 */
-	{ 2,	0,	sys_setreuid,		"setreuid"	}, /* 70 */
-	{ 2,	0,	sys_setregid,		"setregid"	}, /* 71 */
+	{ 2,	0,	sys_setreuid16,		"setreuid"	}, /* 70 */
+	{ 2,	0,	sys_setregid16,		"setregid"	}, /* 71 */
 	{ 3,	TS,	sys_sigsuspend,		"sigsuspend"	}, /* 72 */
 	{ 1,	TS,	sys_sigpending,		"sigpending"	}, /* 73 */
 	{ 2,	0,	sys_sethostname,	"sethostname"	}, /* 74 */
@@ -121,7 +121,7 @@
 	{ 2,	TF,	sys_truncate,		"truncate"	}, /* 92 */
 	{ 2,	TD,	sys_ftruncate,		"ftruncate"	}, /* 93 */
 	{ 2,	TD,	sys_fchmod,		"fchmod"	}, /* 94 */
-	{ 3,	TD,	sys_fchown,		"fchown"	}, /* 95 */
+	{ 3,	TD,	sys_fchown16,		"fchown"	}, /* 95 */
 	{ 2,	0,	sys_getpriority,	"getpriority"	}, /* 96 */
 	{ 3,	0,	sys_setpriority,	"setpriority"	}, /* 97 */
 	{ 4,	0,	sys_profil,		"profil"	}, /* 98 */
@@ -164,8 +164,8 @@
 	{ 3,	0,	sys_sysfs,		"sysfs"		}, /* 135 */
 	{ 1,	0,	sys_personality,	"personality"	}, /* 136 */
 	{ 5,	0,	sys_afs_syscall,	"afs_syscall"	}, /* 137 */
-	{ 1,	NF,	sys_setfsuid,		"setfsuid"	}, /* 138 */
-	{ 1,	NF,	sys_setfsgid,		"setfsgid"	}, /* 139 */
+	{ 1,	NF,	sys_setfsuid16,		"setfsuid"	}, /* 138 */
+	{ 1,	NF,	sys_setfsgid16,		"setfsgid"	}, /* 139 */
 	{ 5,	TD,	sys_llseek,		"_llseek"	}, /* 140 */
 	{ 3,	TD,	sys_getdents,		"getdents"	}, /* 141 */
 	{ 5,	TD,	sys_select,		"select"	}, /* 142 */
@@ -190,14 +190,14 @@
 	{ 2,	0,	sys_sched_rr_get_interval,	"sched_rr_get_interval"	}, /* 161 */
 	{ 2,	0,	sys_nanosleep,		"nanosleep"	}, /* 162 */
 	{ 5,	TM|SI,	sys_mremap,		"mremap"	}, /* 163 */
-	{ 3,	0,	sys_setresuid,		"setresuid"	}, /* 164 */
-	{ 3,	0,	sys_getresuid,		"getresuid"	}, /* 165 */
+	{ 3,	0,	sys_setresuid16,	"setresuid"	}, /* 164 */
+	{ 3,	0,	sys_getresuid16,	"getresuid"	}, /* 165 */
 	{ 5,	0,	sys_vm86,		"vm86"		}, /* 166 */
 	{ 5,	0,	sys_query_module,	"query_module"	}, /* 167 */
 	{ 3,	TD,	sys_poll,		"poll"		}, /* 168 */
 	{ 3,	0,	sys_nfsservctl,		"nfsservctl"	}, /* 169 */
-	{ 3,	0,	sys_setresgid,		"setresgid"	}, /* 170 */
-	{ 3,	0,	sys_getresgid,		"getresgid"	}, /* 171 */
+	{ 3,	0,	sys_setresgid16,	"setresgid"	}, /* 170 */
+	{ 3,	0,	sys_getresgid16,	"getresgid"	}, /* 171 */
 	{ 5,	0,	sys_prctl,		"prctl"		}, /* 172 */
 	{ 0,	TS,	sys_rt_sigreturn,	"rt_sigreturn"	}, /* 173 */
 	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"	}, /* 174 */
@@ -208,7 +208,7 @@
 	{ 2,	TS,	sys_rt_sigsuspend,	"rt_sigsuspend"	}, /* 179 */
 	{ 5,	TD,	sys_pread,		"pread"		}, /* 180 */
 	{ 5,	TD,	sys_pwrite,		"pwrite"	}, /* 181 */
-	{ 3,	TF,	sys_chown,		"lchown"	}, /* 182 */
+	{ 3,	TF,	sys_chown16,		"lchown"	}, /* 182 */
 	{ 2,	TF,	sys_getcwd,		"getcwd"	}, /* 183 */
 	{ 2,	0,	sys_capget,		"capget"	}, /* 184 */
 	{ 2,	0,	sys_capset,		"capset"	}, /* 185 */

linux/dummy.h

@@ -63,10 +63,14 @@
 #define	sys_fdatasync		sys_close
 #define	sys_fsync		sys_close
 #define	sys_getegid		sys_getuid
+#define	sys_getegid16		sys_geteuid16
 #define	sys_geteuid		sys_getuid
+#define	sys_geteuid16		sys_getuid16
 #define	sys_getgid		sys_getuid
+#define	sys_getgid16		sys_getuid16
 #define	sys_getpeername		sys_getsockname
 #define	sys_getresgid		sys_getresuid
+#define	sys_getresgid16		sys_getresuid16
 #define	sys_lstat		sys_stat
 #define	sys_lstat64		sys_stat64
 #define	sys_mkdir		sys_chmod
@@ -82,9 +86,13 @@
 #define	sys_set_robust_list	sys_munmap
 #define	sys_setdomainname	sys_sethostname
 #define	sys_setfsgid		sys_setfsuid
+#define	sys_setfsgid16		sys_setfsuid16
 #define	sys_setgid		sys_setuid
+#define	sys_setgid16		sys_setuid16
 #define	sys_setregid		sys_setreuid
+#define	sys_setregid16		sys_setreuid16
 #define	sys_setresgid		sys_setresuid
+#define	sys_setresgid16		sys_setresuid16
 #define	sys_stime		sys_time
 #define	sys_swapoff		sys_chdir
 #define	sys_symlink		sys_link

linux/i386/syscallent.h

@@ -42,15 +42,15 @@
 	{ 1,	0,	sys_time,		"time"		}, /* 13 */
 	{ 3,	TF,	sys_mknod,		"mknod"		}, /* 14 */
 	{ 2,	TF,	sys_chmod,		"chmod"		}, /* 15 */
-	{ 3,	TF,	sys_chown,		"lchown"	}, /* 16 */
+	{ 3,	TF,	sys_chown16,		"lchown"	}, /* 16 */
 	{ 0,	TM,	sys_break,		"break"		}, /* 17 */
 	{ 2,	TF,	sys_oldstat,		"oldstat"	}, /* 18 */
 	{ 3,	TD,	sys_lseek,		"lseek"		}, /* 19 */
 	{ 0,	0,	sys_getpid,		"getpid"	}, /* 20 */
 	{ 5,	TF,	sys_mount,		"mount"		}, /* 21 */
 	{ 1,	TF,	sys_umount,		"oldumount"	}, /* 22 */
-	{ 1,	0,	sys_setuid,		"setuid"	}, /* 23 */
-	{ 0,	NF,	sys_getuid,		"getuid"	}, /* 24 */
+	{ 1,	0,	sys_setuid16,		"setuid"	}, /* 23 */
+	{ 0,	NF,	sys_getuid16,		"getuid"	}, /* 24 */
 	{ 1,	0,	sys_stime,		"stime"		}, /* 25 */
 	{ 4,	0,	sys_ptrace,		"ptrace"	}, /* 26 */
 	{ 1,	0,	sys_alarm,		"alarm"		}, /* 27 */
@@ -72,11 +72,11 @@
 	{ 1,	0,	sys_times,		"times"		}, /* 43 */
 	{ 0,	0,	sys_prof,		"prof"		}, /* 44 */
 	{ 1,	TM|SI,	sys_brk,		"brk"		}, /* 45 */
-	{ 1,	0,	sys_setgid,		"setgid"	}, /* 46 */
-	{ 0,	NF,	sys_getgid,		"getgid"	}, /* 47 */
+	{ 1,	0,	sys_setgid16,		"setgid"	}, /* 46 */
+	{ 0,	NF,	sys_getgid16,		"getgid"	}, /* 47 */
 	{ 3,	TS,	sys_signal,		"signal"	}, /* 48 */
-	{ 0,	NF,	sys_geteuid,		"geteuid"	}, /* 49 */
-	{ 0,	NF,	sys_getegid,		"getegid"	}, /* 50 */
+	{ 0,	NF,	sys_geteuid16,		"geteuid"	}, /* 49 */
+	{ 0,	NF,	sys_getegid16,		"getegid"	}, /* 50 */
 	{ 1,	TF,	sys_acct,		"acct"		}, /* 51 */
 	{ 2,	TF,	sys_umount2,		"umount"	}, /* 52 */
 	{ 0,	0,	sys_lock,		"lock"		}, /* 53 */
@@ -96,8 +96,8 @@
 	{ 3,	TS,	sys_sigaction,		"sigaction"	}, /* 67 */
 	{ 0,	TS,	sys_siggetmask,		"sgetmask"	}, /* 68 */
 	{ 1,	TS,	sys_sigsetmask,		"ssetmask"	}, /* 69 */
-	{ 2,	0,	sys_setreuid,		"setreuid"	}, /* 70 */
-	{ 2,	0,	sys_setregid,		"setregid"	}, /* 71 */
+	{ 2,	0,	sys_setreuid16,		"setreuid"	}, /* 70 */
+	{ 2,	0,	sys_setregid16,		"setregid"	}, /* 71 */
 	{ 3,	TS,	sys_sigsuspend,		"sigsuspend"	}, /* 72 */
 	{ 1,	TS,	sys_sigpending,		"sigpending"	}, /* 73 */
 	{ 2,	0,	sys_sethostname,	"sethostname"	}, /* 74 */
@@ -121,7 +121,7 @@
 	{ 2,	TF,	sys_truncate,		"truncate"	}, /* 92 */
 	{ 2,	TD,	sys_ftruncate,		"ftruncate"	}, /* 93 */
 	{ 2,	TD,	sys_fchmod,		"fchmod"	}, /* 94 */
-	{ 3,	TD,	sys_fchown,		"fchown"	}, /* 95 */
+	{ 3,	TD,	sys_fchown16,		"fchown"	}, /* 95 */
 	{ 2,	0,	sys_getpriority,	"getpriority"	}, /* 96 */
 	{ 3,	0,	sys_setpriority,	"setpriority"	}, /* 97 */
 	{ 4,	0,	sys_profil,		"profil"	}, /* 98 */
@@ -164,8 +164,8 @@
 	{ 3,	0,	sys_sysfs,		"sysfs"		}, /* 135 */
 	{ 1,	0,	sys_personality,	"personality"	}, /* 136 */
 	{ 5,	0,	sys_afs_syscall,	"afs_syscall"	}, /* 137 */
-	{ 1,	NF,	sys_setfsuid,		"setfsuid"	}, /* 138 */
-	{ 1,	NF,	sys_setfsgid,		"setfsgid"	}, /* 139 */
+	{ 1,	NF,	sys_setfsuid16,		"setfsuid"	}, /* 138 */
+	{ 1,	NF,	sys_setfsgid16,		"setfsgid"	}, /* 139 */
 	{ 5,	TD,	sys_llseek,		"_llseek"	}, /* 140 */
 	{ 3,	TD,	sys_getdents,		"getdents"	}, /* 141 */
 	{ 5,	TD,	sys_select,		"select"	}, /* 142 */
@@ -190,14 +190,14 @@
 	{ 2,	0,	sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 161 */
 	{ 2,	0,	sys_nanosleep,		"nanosleep"	}, /* 162 */
 	{ 5,	TM|SI,	sys_mremap,		"mremap"	}, /* 163 */
-	{ 3,	0,	sys_setresuid,		"setresuid"	}, /* 164 */
-	{ 3,	0,	sys_getresuid,		"getresuid"	}, /* 165 */
+	{ 3,	0,	sys_setresuid16,	"setresuid"	}, /* 164 */
+	{ 3,	0,	sys_getresuid16,	"getresuid"	}, /* 165 */
 	{ 5,	0,	sys_vm86,		"vm86"		}, /* 166 */
 	{ 5,	0,	sys_query_module,	"query_module"	}, /* 167 */
 	{ 3,	TD,	sys_poll,		"poll"		}, /* 168 */
 	{ 3,	0,	sys_nfsservctl,		"nfsservctl"	}, /* 169 */
-	{ 3,	0,	sys_setresgid,		"setresgid"	}, /* 170 */
-	{ 3,	0,	sys_getresgid,		"getresgid"	}, /* 171 */
+	{ 3,	0,	sys_setresgid16,	"setresgid"	}, /* 170 */
+	{ 3,	0,	sys_getresgid16,	"getresgid"	}, /* 171 */
 	{ 5,	0,	sys_prctl,		"prctl"		}, /* 172 */
 	{ 0,	TS,	sys_rt_sigreturn,	"rt_sigreturn"	}, /* 173 */
 	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"	}, /* 174 */
@@ -209,7 +209,7 @@
 
 	{ 5,	TD,	sys_pread,		"pread64"	}, /* 180 */
 	{ 5,	TD,	sys_pwrite,		"pwrite64"	}, /* 181 */
-	{ 3,	TF,	sys_chown,		"chown"		}, /* 182 */
+	{ 3,	TF,	sys_chown16,		"chown"		}, /* 182 */
 	{ 2,	TF,	sys_getcwd,		"getcwd"	}, /* 183 */
 	{ 2,	0,	sys_capget,		"capget"	}, /* 184 */
 	{ 2,	0,	sys_capset,		"capset"	}, /* 185 */