diff options
| author | Robert Watson <rwatson@FreeBSD.org> | 2009-05-01 21:05:40 +0000 |
|---|---|---|
| committer | Robert Watson <rwatson@FreeBSD.org> | 2009-05-01 21:05:40 +0000 |
| commit | fa76567150773e0aab5fdd883cf7652a27c7c25e (patch) | |
| tree | 171b16d02dd5723061d2f482274cbf7792e8e355 /sys/security/mac/mac_sysv_shm.c | |
| parent | 2f369c94965c2583de16148a016279d1927ae125 (diff) | |
| download | src-fa76567150773e0aab5fdd883cf7652a27c7c25e.tar.gz src-fa76567150773e0aab5fdd883cf7652a27c7c25e.zip | |
Rename MAC Framework-internal macros used to invoke policy entry points:
MAC_BOOLEAN -> MAC_POLICY_BOOLEAN
MAC_BOOLEAN_NOSLEEP -> MAC_POLICY_BOOLEANN_NOSLEEP
MAC_CHECK -> MAC_POLICY_CHECK
MAC_CHECK_NOSLEEP -> MAC_POLICY_CHECK_NOSLEEP
MAC_EXTERNALIZE -> MAC_POLICY_EXTERNALIZE
MAC_GRANT -> MAC_POLICY_GRANT
MAC_GRANT_NOSLEEP -> MAC_POLICY_GRANT_NOSLEEP
MAC_INTERNALIZE -> MAC_POLICY_INTERNALIZE
MAC_PERFORM -> MAC_POLICY_PERFORM_CHECK
MAC_PERFORM_NOSLEEP -> MAC_POLICY_PERFORM_NOSLEEP
This frees up those macro names for use in wrapping calls into the MAC
Framework from the remainder of the kernel.
Obtained from: TrustedBSD Project
Notes
Notes:
svn path=/head/; revision=191731
Diffstat (limited to 'sys/security/mac/mac_sysv_shm.c')
| -rw-r--r-- | sys/security/mac/mac_sysv_shm.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/security/mac/mac_sysv_shm.c b/sys/security/mac/mac_sysv_shm.c index 57c22646c577..168e5b689f93 100644 --- a/sys/security/mac/mac_sysv_shm.c +++ b/sys/security/mac/mac_sysv_shm.c @@ -68,7 +68,7 @@ mac_sysv_shm_label_alloc(void) struct label *label; label = mac_labelzone_alloc(M_WAITOK); - MAC_PERFORM(sysvshm_init_label, label); + MAC_POLICY_PERFORM(sysvshm_init_label, label); return (label); } @@ -86,7 +86,7 @@ static void mac_sysv_shm_label_free(struct label *label) { - MAC_PERFORM_NOSLEEP(sysvshm_destroy_label, label); + MAC_POLICY_PERFORM_NOSLEEP(sysvshm_destroy_label, label); mac_labelzone_free(label); } @@ -104,7 +104,7 @@ void mac_sysvshm_create(struct ucred *cred, struct shmid_kernel *shmsegptr) { - MAC_PERFORM_NOSLEEP(sysvshm_create, cred, shmsegptr, + MAC_POLICY_PERFORM_NOSLEEP(sysvshm_create, cred, shmsegptr, shmsegptr->label); } @@ -112,7 +112,7 @@ void mac_sysvshm_cleanup(struct shmid_kernel *shmsegptr) { - MAC_PERFORM_NOSLEEP(sysvshm_cleanup, shmsegptr->label); + MAC_POLICY_PERFORM_NOSLEEP(sysvshm_cleanup, shmsegptr->label); } MAC_CHECK_PROBE_DEFINE3(sysvshm_check_shmat, "struct ucred *", @@ -124,7 +124,7 @@ mac_sysvshm_check_shmat(struct ucred *cred, struct shmid_kernel *shmsegptr, { int error; - MAC_CHECK_NOSLEEP(sysvshm_check_shmat, cred, shmsegptr, + MAC_POLICY_CHECK_NOSLEEP(sysvshm_check_shmat, cred, shmsegptr, shmsegptr->label, shmflg); MAC_CHECK_PROBE3(sysvshm_check_shmat, error, cred, shmsegptr, shmflg); @@ -141,7 +141,7 @@ mac_sysvshm_check_shmctl(struct ucred *cred, struct shmid_kernel *shmsegptr, { int error; - MAC_CHECK_NOSLEEP(sysvshm_check_shmctl, cred, shmsegptr, + MAC_POLICY_CHECK_NOSLEEP(sysvshm_check_shmctl, cred, shmsegptr, shmsegptr->label, cmd); MAC_CHECK_PROBE3(sysvshm_check_shmctl, error, cred, shmsegptr, cmd); @@ -156,7 +156,7 @@ mac_sysvshm_check_shmdt(struct ucred *cred, struct shmid_kernel *shmsegptr) { int error; - MAC_CHECK_NOSLEEP(sysvshm_check_shmdt, cred, shmsegptr, + MAC_POLICY_CHECK_NOSLEEP(sysvshm_check_shmdt, cred, shmsegptr, shmsegptr->label); MAC_CHECK_PROBE2(sysvshm_check_shmdt, error, cred, shmsegptr); @@ -172,7 +172,7 @@ mac_sysvshm_check_shmget(struct ucred *cred, struct shmid_kernel *shmsegptr, { int error; - MAC_CHECK_NOSLEEP(sysvshm_check_shmget, cred, shmsegptr, + MAC_POLICY_CHECK_NOSLEEP(sysvshm_check_shmget, cred, shmsegptr, shmsegptr->label, shmflg); MAC_CHECK_PROBE3(sysvshm_check_shmget, error, cred, shmsegptr, shmflg); |