PERFORCE change 80010 for review

Robert Watson rwatson at FreeBSD.org
Mon Jul 11 16:27:57 GMT 2005


http://perforce.freebsd.org/chv.cgi?CH=80010

Change 80010 by rwatson at rwatson_zoo on 2005/07/11 16:27:09

	Fix AUE_FSTATFS spelling.
	
	Don't audit Linux-emulated readdir(), mremap() for now, since we
	don't have a record type for them yet.
	
	Don't audit Linux-emulated getreuid(), getregid(), getresuid(),
	getresgid(), as they're not required.
	
	Fix spelling of AUE_SETREUID/GID from GETREUID/GID.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_sysent.c#9 edit
.. //depot/projects/trustedbsd/audit3/sys/i386/linux/syscalls.master#8 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_sysent.c#9 (text+ko) ====

@@ -109,7 +109,7 @@
 	{ AS(linux_uselib_args), (sy_call_t *)linux_uselib, AUE_NULL },	/* 86 = linux_uselib */
 	{ AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON },	/* 87 = swapon */
 	{ AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT },	/* 88 = linux_reboot */
-	{ AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_READDIR },	/* 89 = linux_readdir */
+	{ AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_NULL },	/* 89 = linux_readdir */
 	{ AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP },	/* 90 = linux_mmap */
 	{ AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP },	/* 91 = munmap */
 	{ AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE },	/* 92 = linux_truncate */
@@ -120,7 +120,7 @@
 	{ SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY },	/* 97 = setpriority */
 	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 98 = profil */
 	{ AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS },	/* 99 = linux_statfs */
-	{ AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_NFSTATFS },	/* 100 = linux_fstatfs */
+	{ AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS },	/* 100 = linux_fstatfs */
 	{ AS(linux_ioperm_args), (sy_call_t *)linux_ioperm, AUE_NULL },	/* 101 = linux_ioperm */
 	{ AS(linux_socketcall_args), (sy_call_t *)linux_socketcall, AUE_NULL },	/* 102 = linux_socketcall */
 	{ AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL },	/* 103 = linux_syslog */
@@ -183,15 +183,15 @@
 	{ SYF_MPSAFE | AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_NULL },	/* 160 = linux_sched_get_priority_min */
 	{ SYF_MPSAFE | AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_NULL },	/* 161 = sched_rr_get_interval */
 	{ SYF_MPSAFE | AS(nanosleep_args), (sy_call_t *)nanosleep, AUE_NULL },	/* 162 = nanosleep */
-	{ AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_MREMAP },	/* 163 = linux_mremap */
+	{ AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL },	/* 163 = linux_mremap */
 	{ SYF_MPSAFE | AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_SETRESUID },	/* 164 = linux_setresuid16 */
-	{ SYF_MPSAFE | AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_GETRESUID },	/* 165 = linux_getresuid16 */
+	{ SYF_MPSAFE | AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_NULL },	/* 165 = linux_getresuid16 */
 	{ 0, (sy_call_t *)linux_vm86, AUE_NULL },		/* 166 = linux_vm86 */
 	{ 0, (sy_call_t *)linux_query_module, AUE_NULL },	/* 167 = linux_query_module */
 	{ AS(poll_args), (sy_call_t *)poll, AUE_POLL },	/* 168 = poll */
 	{ 0, (sy_call_t *)linux_nfsservctl, AUE_NULL },	/* 169 = linux_nfsservctl */
 	{ SYF_MPSAFE | AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_SETRESGID },	/* 170 = linux_setresgid16 */
-	{ SYF_MPSAFE | AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_GETRESGID },	/* 171 = linux_getresgid16 */
+	{ SYF_MPSAFE | AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_NULL },	/* 171 = linux_getresgid16 */
 	{ 0, (sy_call_t *)linux_prctl, AUE_NULL },	/* 172 = linux_prctl */
 	{ AS(linux_rt_sigreturn_args), (sy_call_t *)linux_rt_sigreturn, AUE_SIGRETURN },	/* 173 = linux_rt_sigreturn */
 	{ SYF_MPSAFE | AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_SIGACTION },	/* 174 = linux_rt_sigaction */
@@ -223,15 +223,15 @@
 	{ SYF_MPSAFE | 0, (sy_call_t *)linux_getgid, AUE_GETGID },	/* 200 = linux_getgid */
 	{ SYF_MPSAFE | 0, (sy_call_t *)geteuid, AUE_GETEUID },	/* 201 = geteuid */
 	{ SYF_MPSAFE | 0, (sy_call_t *)getegid, AUE_GETEGID },	/* 202 = getegid */
-	{ SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_GETREUID },	/* 203 = setreuid */
-	{ SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_GETREGID },	/* 204 = setregid */
+	{ SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID },	/* 203 = setreuid */
+	{ SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID },	/* 204 = setregid */
 	{ SYF_MPSAFE | AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_GETGROUPS },	/* 205 = linux_getgroups */
 	{ SYF_MPSAFE | AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS },	/* 206 = linux_setgroups */
 	{ AS(fchown_args), (sy_call_t *)fchown, AUE_NULL },	/* 207 = fchown */
 	{ SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID },	/* 208 = setresuid */
-	{ SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID },	/* 209 = getresuid */
+	{ SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_NULL },	/* 209 = getresuid */
 	{ SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID },	/* 210 = setresgid */
-	{ SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID },	/* 211 = getresgid */
+	{ SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_NULL },	/* 211 = getresgid */
 	{ AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN },	/* 212 = linux_chown */
 	{ SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID },	/* 213 = setuid */
 	{ SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID },	/* 214 = setgid */
@@ -240,7 +240,7 @@
 	{ AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_NULL },	/* 217 = linux_pivot_root */
 	{ AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE },	/* 218 = linux_mincore */
 	{ SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE },	/* 219 = madvise */
-	{ AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDSNTS },	/* 220 = linux_getdents64 */
+	{ AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS },	/* 220 = linux_getdents64 */
 	{ SYF_MPSAFE | AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL },	/* 221 = linux_fcntl64 */
 	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 222 =  */
 	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 223 =  */

==== //depot/projects/trustedbsd/audit3/sys/i386/linux/syscalls.master#8 (text+ko) ====

@@ -173,7 +173,7 @@
 87	AUE_SWAPON	NOPROTO	{ int swapon(char *name); }
 88	AUE_REBOOT	STD	{ int linux_reboot(l_int magic1, \
 				    l_int magic2, l_uint cmd, void *arg); }
-89	AUE_READDIR	STD	{ int linux_readdir(l_uint fd, \
+89	AUE_NULL	STD	{ int linux_readdir(l_uint fd, \
 				    struct l_dirent *dent, l_uint count); }
 90	AUE_MMAP	STD	{ int linux_mmap(struct l_mmap_argv *ptr); }
 91	AUE_MUNMAP	NOPROTO	{ int munmap(caddr_t addr, int len); }
@@ -188,7 +188,7 @@
 98	AUE_NULL	UNIMPL	profil
 99	AUE_STATFS	STD	{ int linux_statfs(char *path, \
 				    struct l_statfs_buf *buf); }
-100	AUE_NFSTATFS	STD	{ int linux_fstatfs(l_uint fd, \
+100	AUE_FSTATFS	STD	{ int linux_fstatfs(l_uint fd, \
 				    struct l_statfs_buf *buf); }
 101	AUE_NULL	STD	{ int linux_ioperm(l_ulong start, \
 				    l_ulong length, l_int enable); }
@@ -291,12 +291,12 @@
 162	AUE_NULL	MNOPROTO { int nanosleep( \
 				    const struct timespec *rqtp, \
 				    struct timespec *rmtp); }
-163	AUE_MREMAP	STD	{ int linux_mremap(l_ulong addr, \
+163	AUE_NULL	STD	{ int linux_mremap(l_ulong addr, \
 				    l_ulong old_len, l_ulong new_len, \
 				    l_ulong flags, l_ulong new_addr); }
 164	AUE_SETRESUID	MSTD	{ int linux_setresuid16(l_uid16_t ruid, \
 				    l_uid16_t euid, l_uid16_t suid); }
-165	AUE_GETRESUID	MSTD	{ int linux_getresuid16(l_uid16_t *ruid, \
+165	AUE_NULL	MSTD	{ int linux_getresuid16(l_uid16_t *ruid, \
 				    l_uid16_t *euid, l_uid16_t *suid); }
 166	AUE_NULL	STD	{ int linux_vm86(void); }
 167	AUE_NULL	STD	{ int linux_query_module(void); }
@@ -305,7 +305,7 @@
 169	AUE_NULL	STD	{ int linux_nfsservctl(void); }
 170	AUE_SETRESGID	MSTD	{ int linux_setresgid16(l_gid16_t rgid, \
 				    l_gid16_t egid, l_gid16_t sgid); }
-171	AUE_GETRESGID	MSTD	{ int linux_getresgid16(l_gid16_t *rgid, \
+171	AUE_NULL	MSTD	{ int linux_getresgid16(l_gid16_t *rgid, \
 				    l_gid16_t *egid, l_gid16_t *sgid); }
 172	AUE_NULL	STD	{ int linux_prctl(void); }
 173	AUE_SIGRETURN	STD	{ int linux_rt_sigreturn( \
@@ -359,8 +359,8 @@
 200	AUE_GETGID	MSTD	{ int linux_getgid(void); }
 201	AUE_GETEUID	MNOPROTO { int geteuid(void); }
 202	AUE_GETEGID	MNOPROTO { int getegid(void); }
-203	AUE_GETREUID	MNOPROTO { int setreuid(uid_t ruid, uid_t euid); }
-204	AUE_GETREGID	MNOPROTO { int setregid(gid_t rgid, gid_t egid); }
+203	AUE_SETREUID	MNOPROTO { int setreuid(uid_t ruid, uid_t euid); }
+204	AUE_SETREGID	MNOPROTO { int setregid(gid_t rgid, gid_t egid); }
 205	AUE_GETGROUPS	MSTD	{ int linux_getgroups(l_int gidsetsize, \
 				    l_gid_t *grouplist); }
 206	AUE_SETGROUPS	MSTD	{ int linux_setgroups(l_int gidsetsize, \
@@ -368,11 +368,11 @@
 207	AUE_FCHOWN	NODEF	fchown fchown fchown_args int
 208	AUE_SETRESUID	MNOPROTO { int setresuid(uid_t ruid, uid_t euid, \
 				    uid_t suid); }
-209	AUE_GETRESUID	MNOPROTO { int getresuid(uid_t *ruid, uid_t *euid, \
+209	AUE_NULL	MNOPROTO { int getresuid(uid_t *ruid, uid_t *euid, \
 				    uid_t *suid); }
 210	AUE_SETRESGID	MNOPROTO { int setresgid(gid_t rgid, gid_t egid, \
 				    gid_t sgid); }
-211	AUE_GETRESGID	MNOPROTO { int getresgid(gid_t *rgid, gid_t *egid, \
+211	AUE_NULL	MNOPROTO { int getresgid(gid_t *rgid, gid_t *egid, \
 				    gid_t *sgid); }
 212	AUE_CHOWN	STD	{ int linux_chown(char *path, l_uid_t uid, \
 				    l_gid_t gid); }
@@ -386,7 +386,7 @@
 				    l_size_t len, u_char *vec); }
 219	AUE_MADVISE	MNOPROTO { int madvise(void *addr, size_t len, \
 				    int behav); }
-220	AUE_O_GETDSNTS	STD	{ int linux_getdents64(l_uint fd, \
+220	AUE_O_GETDENTS	STD	{ int linux_getdents64(l_uint fd, \
 				    void *dirent, l_uint count); }
 221	AUE_FCNTL	MSTD	{ int linux_fcntl64(l_uint fd, l_uint cmd, \
 				    l_ulong arg); }
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message



More information about the trustedbsd-cvs mailing list