Date: Wed, 31 Aug 2005 20:34:00 GMT From: "Christian S.J. Peron" <csjp@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 82937 for review Message-ID: <200508312034.j7VKY0rP032410@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=82937 Change 82937 by csjp@csjp_xor on 2005/08/31 20:33:54 Rename mac_syscall_enter/exit entry points to mac_thread_syscall_enter and exit. Requested by: rwatson Affected files ... .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/trap.c#27 edit .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/trap.c#18 edit .. //depot/projects/trustedbsd/mac/sys/arm/arm/trap.c#8 edit .. //depot/projects/trustedbsd/mac/sys/i386/i386/trap.c#41 edit .. //depot/projects/trustedbsd/mac/sys/ia64/ia32/ia32_trap.c#5 edit .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/trap.c#32 edit .. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/trap.c#21 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_system.c#12 edit .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/trap.c#30 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#281 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#238 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/alpha/alpha/trap.c#27 (text+ko) ==== @@ -736,10 +736,10 @@ PTRACESTOP_SC(p, td, S_PT_SCE); #ifdef MAC - error = mac_syscall_enter(td, args + hidden, code); + error = mac_thread_syscall_enter(td, args + hidden, code); if (error == 0) error = (*callp->sy_call)(td, args + hidden); - mac_syscall_exit(td, args + hidden, code, error); + mac_thread_syscall_exit(td, args + hidden, code, error); #else error = (*callp->sy_call)(td, args + hidden); #endif ==== //depot/projects/trustedbsd/mac/sys/amd64/amd64/trap.c#18 (text+ko) ==== @@ -792,10 +792,10 @@ if ((callp->sy_narg & SYF_MPSAFE) == 0) mtx_lock(&Giant); #ifdef MAC - error = mac_syscall_enter(td, argp, code); + error = mac_thread_syscall_enter(td, argp, code); if (error == 0) error = (*callp->sy_call)(td, argp); - mac_syscall_exit(td, argp, code, error); + mac_thread_syscall_exit(td, argp, code, error); #else error = (*callp->sy_call)(td, argp); #endif ==== //depot/projects/trustedbsd/mac/sys/arm/arm/trap.c#8 (text+ko) ==== @@ -924,10 +924,10 @@ STOPEVENT(p, S_SCE, (callp->sy_narg & SYF_ARGMASK)); PTRACESTOP_SC(p, td, S_PT_SCE); #ifdef MAC - error = mac_syscall_enter(td, args, code); + error = mac_thread_syscall_enter(td, args, code); if (error == 0) error = (*callp->sy_call)(td, args); - mac_syscall_exit(td, args, code, error); + mac_thread_syscall_exit(td, args, code, error); #else error = (*callp->sy_call)(td, args); #endif ==== //depot/projects/trustedbsd/mac/sys/i386/i386/trap.c#41 (text+ko) ==== @@ -984,10 +984,10 @@ PTRACESTOP_SC(p, td, S_PT_SCE); #ifdef MAC - error = mac_syscall_enter(td, args, code); + error = mac_thread_syscall_enter(td, args, code); if (error == 0) error = (*callp->sy_call)(td, args); - mac_syscall_exit(td, args, code, error); + mac_thread_syscall_exit(td, args, code, error); #else error = (*callp->sy_call)(td, args); #endif ==== //depot/projects/trustedbsd/mac/sys/ia64/ia32/ia32_trap.c#5 (text+ko) ==== @@ -127,10 +127,10 @@ STOPEVENT(p, S_SCE, narg); #ifdef MAC - eror = mac_syscall_enter(td, args64, code); + eror = mac_thread_syscall_enter(td, args64, code); if (error == 0) error = (*callp->sy_call)(td, args64); - mac_syscall_exit(td, args64, code, error); + mac_thread_syscall_exit(td, args64, code, error); #else error = (*callp->sy_call)(td, args64); #endif ==== //depot/projects/trustedbsd/mac/sys/ia64/ia64/trap.c#32 (text+ko) ==== @@ -1003,10 +1003,10 @@ if ((callp->sy_narg & SYF_MPSAFE) == 0) mtx_lock(&Giant); #ifdef MAC - error = mac_syscall_enter(td, args, code); + error = mac_thread_syscall_enter(td, args, code); if (error == 0) error = (*callp->sy_call)(td, args); - mac_syscall_exit(td, args, code, error); + mac_thread_syscall_exit(td, args, code, error); #else error = (*callp->sy_call)(td, args); #endif ==== //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/trap.c#21 (text+ko) ==== @@ -417,10 +417,10 @@ STOPEVENT(p, S_SCE, narg); #ifdef MAC - error = mac_syscall_enter(td, params, code); + error = mac_thread_syscall_enter(td, params, code); if (error == 0) error = (*callp->sy_call)(td, params); - mac_syscall_exit(td, params, code, error); + mac_thread_syscall_exit(td, params, code, error); #else error = (*callp->sy_call)(td, params); #endif ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_system.c#12 (text+ko) ==== @@ -272,21 +272,21 @@ } int -mac_syscall_enter(struct thread *td, int *args, int code) +mac_thread_syscall_enter(struct thread *td, int *args, int code) { int error; if (!mac_enforce_syscall) return (0); - MAC_CHECK(syscall_enter, td, args, code); + MAC_CHECK(thread_syscall_enter, td, args, code); return (error); } void -mac_syscall_exit(struct thread *td, int *args, int code, int errcode) +mac_thread_syscall_exit(struct thread *td, int *args, int code, int errcode) { if (!mac_enforce_syscall) return; - MAC_PERFORM(syscall_exit, td, args, code, errcode); + MAC_PERFORM(thread_syscall_exit, td, args, code, errcode); } ==== //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/trap.c#30 (text+ko) ==== @@ -591,10 +591,10 @@ PTRACESTOP_SC(p, td, S_PT_SCE); #ifdef MAC - error = mac_syscall_enter(td, argp, code); + error = mac_thread_syscall_enter(td, argp, code); if (error == 0) error = (*callp->sy_call)(td, argp); - mac_syscall_exit(td, argp, code, error); + mac_thread_syscall_exit(td, argp, code, error); #else error = (*callp->sy_call)(td, argp); #endif ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#281 (text+ko) ==== @@ -411,8 +411,8 @@ int mac_check_system_swapoff(struct ucred *cred, struct vnode *vp); int mac_check_system_sysctl(struct ucred *cred, struct sysctl_oid *oidp, void *arg1, int arg2, struct sysctl_req *req); -int mac_syscall_enter(struct thread *td, int *args, int code); -void mac_syscall_exit(struct thread *td, int *args, int code, +int mac_thread_syscall_enter(struct thread *td, int *args, int code); +void mac_thread_syscall_exit(struct thread *td, int *args, int code, int errcode); int mac_check_vnode_access(struct ucred *cred, struct vnode *vp, int acc_mode); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#238 (text+ko) ==== @@ -494,8 +494,8 @@ int (*mpo_check_system_sysctl)(struct ucred *cred, struct sysctl_oid *oidp, void *arg1, int arg2, struct sysctl_req *req); - int (*mpo_syscall_enter)(struct thread *td, int *args, int code); - void (*mpo_syscall_exit)(struct thread *td, int *args, int code, + int (*mpo_thread_syscall_enter)(struct thread *td, int *args, int code); + void (*mpo_thread_syscall_exit)(struct thread *td, int *args, int code, int error); int (*mpo_check_vnode_access)(struct ucred *cred, struct vnode *vp, struct label *label, int acc_mode);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200508312034.j7VKY0rP032410>